[2015.8] Merge forward from 2015.5 to 2015.8 #31904
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix outdated Jinja 'env' variable reference
This should be set at the master level, so that whoever is authenticating has to conform to what is set by the administrator that setup salt.
This should be set at the master level, so that whoever is authenticating has to conform to what is set by the administrator that setup salt.
Remove ability of authenticating user to specify pam service
Remove ability of authenticating user to specify pam service
add 2014.7.9 release notes
add 2014.7.8 release notes
[2015.5] Merge forward from 2014.7 to 2015.5
Make sure __virtual__ error message is helpful when psutil is missing
Added based on comment from Issue saltstack#31867
Add "python module" clarification to ps __virtual__ warning.
Updated .testing.pylintrc to match newer versions of pylint
Conflicts: - .testing.pylintrc - salt/cloud/clouds/joyent.py
|
@rallytime and @jtand It looks like something may have gone wrong with that merge conflict in the new pylintrc. Could you guys take a look? |
|
Yes it's not a merge conflict, but just new files in 2015.8 that need to be updated to the new pylint options. I'm looking into it now. |
|
Ah, of course. Good point. |
added 3 commits
March 15, 2016 14:55
rallytime
pushed a commit
that referenced
this pull request
Mar 16, 2016
[2015.8] Merge forward from 2015.5 to 2015.8
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts: