[2016.3] Merge forward from 2015.8 to 2016.3 #34073
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
This is done for API compatibility
This is done for API compatibility
This is done for API compatibility
This is done for API compatibility
This is done for API compatibility
This is done for API compatibility
This is done for API compatibility
This resolves an edge case in which the "fromrepo" argument is passed to the pkg.uptodate state. We pass through the kwargs to pkg.upgrade, but do not pass the same kwargs to list_upgrades, resulting in inconsistent results.
Back-port saltstack#33806 to 2015.5
pkg.uptodate: Pass kwargs to pkg.list_upgrades
Removes the salt_projects.rst file which hasn't been updated in a long time, this is replaced by the updated topics/projects/index.rst file Adds a note about Salt Pack to the installation doc
Write some more simple batch command tests
Add docs and tests to disk state
modules.gem int tests: more fixes
Clarify the `account_exists` parameter
Adds links to several current Salt-related projects
The test in the virtual function was unnecessary. The pam module does not itself rely on any external python or pam libraries. The only function present, pam.read_file(), accepts a file name as a parameter, checks if it exists, and parses the file. There is no reason to avoid loading the module. Fixes saltstack#20809
This should be using the test suite method of generating opts
We were doing an extra and unecessary full traversal of the minion cache. This refactors all returners and the master to reduce this to a single call. More work will be forthcoming to reduce this even further, especially in the context of auth lookups.
Conflicts: - salt/modules/aptpkg.py - salt/modules/ebuild.py - salt/modules/zypper.py - salt/states/pkg.py - tests/integration/output/output.py
[2015.8] Merge forward from 2015.5 to 2015.8
* states.file: fix indentation in YAML examples * More YAML indentation fixes
Updated latest release version
…tstack#34051) from registering in consul.agent_service_register. A nonexistent dict key was being referenced, causing an Excpetion and failure to register the service. This fix required only changing the offending line to use the "get" method and supplying a default value.
Back-port saltstack#33948 and saltstack#34009 to 2015.8
RFC: proposed fix for multiple fileserver updates in masterless runs
…message Add a test to check for disconnected minion messaging
Conflicts: - doc/topics/installation/index.rst - salt/master.py - salt/modules/mac_brew.py - salt/modules/pacman.py - salt/modules/solarisips.py - salt/returners/postgres_local_cache.py - salt/states/apache_module.py - salt/utils/minions.py - tests/unit/acl/client_test.py
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: