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

Fixed issue #18880 in 2014.7 branch #23298

Merged
merged 1 commit into from
May 3, 2015
Merged

Conversation

chris-prince
Copy link
Contributor

No description provided.

@jfindlay
Copy link
Contributor

jfindlay commented May 3, 2015

@chris-prince, thanks for working on this. It is not necessary to submit separate fixes to different branches as older branches are regularly merged into newer branches and will propagate your changes naturally, see https://docs.saltstack.com/en/latest/topics/development/contributing.html#which-salt-branch.

@jfindlay
Copy link
Contributor

jfindlay commented May 3, 2015

Fixes #18880.

@chris-prince
Copy link
Contributor Author

@jfindlay, thanks for the link, I hadn't seen that document.

In that case, feel free to close the pull request against 2015.2. (Or I will do it if you need me to.)

This pull request (/pull/23298, against 2014.7) is the oldest branch I fixed. I believe my pull request against 'develop' was already merged, but I -- and others -- would like to see this fix in 2014.7 as well. Thanks!

@rallytime
Copy link
Contributor

Thanks @chris-prince! The link that @jfindlay provided above is the typical workflow, but since I know we are getting close to tagging the next release (2015.2.0), I'll merge both of these so we can be certain the fix made it into all branches.

rallytime pushed a commit that referenced this pull request May 3, 2015
@rallytime rallytime merged commit c399b8f into saltstack:2014.7 May 3, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants