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
[2015.8] Merge forward from 2015.5 to 2015.8 #26765
Merged
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 allows us to pass lists of args to cmd.* without having to do type checking beforehand to make sure they're lists.
Also made a number of formatting fixes
Fix function spacing
Refactor cloud provider tests to be more accurate
version change for latest branch
[doc-fix] Removing special character from salt.runners.pillar and other changes
Conflicts: doc/conf.py salt/modules/win_service.py tests/integration/cloud/providers/digital_ocean.py
[2015.5] Merge forward from 2014.7 to 2015.5
* It looks like function 'pkg_resource.compare' used in orig. file is obsolete, * change correcting following exception, when comparing currently installed and latest available package versions: ~~~ The minion function caused an exception: Traceback (most recent call last): File "/usr/local/lib/python2.7/site-packages/salt/minion.py", line 1161, in _thread_return return_data = func(*args, **kwargs) File "/usr/local/lib/python2.7/site-packages/salt/modules/openbsdpkg.py", line 108, in latest_version if not cur or __salt__['pkg_resource.compare'](pkg1=cur, File "/usr/local/lib/python2.7/site-packages/salt/utils/lazy.py", line 90, in __getitem__ raise KeyError(key) KeyError: 'pkg_resource.compare' ~~
Backport saltstack#26693 to 2015.5
…h-redaction-2015.5 Better HTTPS basic auth redaction for 2015.5 branch
Ignore the first element of kern.disks split, which is the sysctl name
Fix Windows failures in pip module due to raw string formatting
Ensure VM name is valid before trying to create Linode VM
Update GCE driver to return True, False or a new name in __virtual__()
add exception placeholder for older msgpacks
Changed import from smbconnection to smb3
import elementree from _compat in ilo exec mod
Conflicts: doc/conf.py salt/cloud/clouds/gce.py salt/cloud/clouds/linode.py salt/grains/ssds.py salt/modules/git.py salt/modules/pip.py tests/integration/cloud/providers/gogrid.py tests/integration/cloud/providers/linode.py tests/integration/cloud/providers/msazure.py tests/integration/cloud/providers/rackspace.py tests/unit/modules/pip_test.py
basepi
added a commit
that referenced
this pull request
Aug 29, 2015
[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.
[2015.8] Merge forward from 2015.5 to 2015.8