[2016.3] Merge forward from 2015.8 to 2016.3 #34025
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
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
Conflicts: - doc/topics/installation/index.rst - salt/modules/mac_brew.py - salt/modules/pacman.py - salt/modules/pam.py - salt/modules/solarisips.py - tests/integration/output/output.py
|
conflict on salt/modules/pam.py looks properly resolved to me! ;) |
|
Working on these test failures. |
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jun 16, 2016
* upstream/develop: (42 commits) Typo fix (saltstack#34066) states.disk: rewrite unit tests states.disk.status: validate percent values states.disk: add documentation _active_mounts_openbsd: unbreak output for special filesystems (saltstack#34057) Use the develop version of the disk state fix saltstack#34038 (saltstack#34042) Merge pull request saltstack#34025 from rallytime/merge-2016.3 Update saltmod tests to use master __opts__ Documentation to describe orchestration support for masterless minions Support `salt.state` orchestration formats on masterless minions Import the orchestrate runner as an execution module function Updated latest release to 2016.3.1 Clean up installation instructions code-block type updates Add link to jinja tutorial fix launch config creation params (saltstack#34014) Always make chanes to minion config if set (saltstack#34021) `states.postgres_privileges` expects a real list, not a comma-separated string for `privileges` one clause to set OS grain from CPE_NAME fix redis_return's clean_old_jobs. Adds new Understanding Jinja topic, and fixes several Jinja doc issues. Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability. Call `sys.exit()` instead of `exit()` ...
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: