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

[2015.8] Merge forward from 2015.5 to 2015.8 #26765

Merged
merged 44 commits into from Aug 29, 2015

Conversation

basepi
Copy link
Contributor

@basepi basepi commented Aug 28, 2015

[2015.8] Merge forward from 2015.5 to 2015.8

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

terminalmage and others added 30 commits August 24, 2015 15:26
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
Refactor cloud provider tests to be more accurate
[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'
~~
…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
rallytime and others added 13 commits August 27, 2015 11:50
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
@basepi basepi merged commit 203cf7a into saltstack:2015.8 Aug 29, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants