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

Back-port #24741 to 2015.5 #24790

Merged
merged 3 commits into from Jun 19, 2015
Merged

Back-port #24741 to 2015.5 #24790

merged 3 commits into from Jun 19, 2015

Conversation

rallytime
Copy link
Contributor

Back-port #24741 to 2015.5

Cameron Norman added 3 commits June 18, 2015 09:04
* Properly search for manual stanza instead of just override
* Handle "manual" stanzas in both override and regular conf files
* Do not try to disable/enable already enabled services
* Do not overwrite override files (use append) on disable
* Only delete empty override files on enable
@jfindlay jfindlay added the Platform Relates to OS, containers, platform-based utilities like FS, system based apps label Jun 19, 2015
jfindlay added a commit that referenced this pull request Jun 19, 2015
@jfindlay jfindlay merged commit d2edb63 into saltstack:2015.5 Jun 19, 2015
@rallytime rallytime deleted the bp-24741 branch June 19, 2015 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Execution-Module Platform Relates to OS, containers, platform-based utilities like FS, system based apps Tests-Passed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants