Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't return multiple elements for grain 'osmajorrelease'. #15337

Merged
merged 1 commit into from Sep 1, 2014

Conversation

eliasp
Copy link
Contributor

@eliasp eliasp commented Aug 28, 2014

Before this fix, the output of the osmajorrelease grain looked like
this:

osmajorrelease:
    7
    0.1406

Now it'll only return the actual major release number:

osmajorrelease: 7

This fix needs to be merged into develop and cherry-picked into 2014.1.

Before this fix, the output of the 'osmajorrelease' grain looked like
this:

    osmajorrelease:
        7
        0.1406

Now it'll only return the actual major release number:

    osmajorrelease: 7
@ghost
Copy link

ghost commented Aug 28, 2014

Test PASSed.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/7390/

terminalmage pushed a commit that referenced this pull request Sep 1, 2014
Don't return multiple elements for grain 'osmajorrelease'.
@terminalmage terminalmage merged commit 6f3d381 into saltstack:2014.7 Sep 1, 2014
@terminalmage
Copy link
Contributor

Thanks!

@eliasp eliasp deleted the 2014.7-grains.osmajorrelease branch September 1, 2014 19:32
@terminalmage
Copy link
Contributor

Backported and forward-merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants