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.

Sign up for GitHub

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

Jump to bottom

[2015.8] Merge forward from 2015.5 to 2015.8 #26765

Merged
merged 44 commits into from Aug 29, 2015
Merged

[2015.8] Merge forward from 2015.5 to 2015.8 #26765

merged 44 commits into from Aug 29, 2015

Commits on Aug 24, 2015

  1. Catch TypeErrors in timed_subprocess 

    This allows us to pass lists of args to cmd.* without having to do type
checking beforehand to make sure they're lists.
    @terminalmage
    terminalmage committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    cd35df5 View commit details
    Browse the repository at this point in the history

  2. salt/modules/pip.py: Remove raw string format flags

    @terminalmage
    terminalmage committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    1c90cdb View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2015

  1. Pass command to cmd.run_all as list instead of joining 

    Also made a number of formatting fixes
    @terminalmage
    terminalmage committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    03250db View commit details
    Browse the repository at this point in the history

  2. Fix tests to reflect args being passed as lists instead of strings

    @terminalmage
    terminalmage committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    ede057e View commit details
    Browse the repository at this point in the history

  3. Lint fix

    @terminalmage
    terminalmage committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    4192215 View commit details
    Browse the repository at this point in the history

  4. Update cloud tests to be more efficient and accurate

    rallytime committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    9ae1539 View commit details
    Browse the repository at this point in the history

  5. Skip digital ocean tests since we can't use API v1 with v2 tests

    rallytime committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    b5b58eb View commit details
    Browse the repository at this point in the history

  6. Keep ec2 instance creation test the same - it works better for the ec… 

    …2 output
    rallytime committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    2b4bc16 View commit details
    Browse the repository at this point in the history

  7. Don't use id as variable

    rallytime committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    c0d83d5 View commit details
    Browse the repository at this point in the history

  8. Fix function spacing

    François-Xavier Choinière committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    ebe5d9d View commit details
    Browse the repository at this point in the history

  9. Merge pull request saltstack#26640 from efficks/fixws2014 

    Fix function spacing
    @basepi
    basepi committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    304542b View commit details
    Browse the repository at this point in the history

  10. Merge pull request saltstack#26636 from rallytime/cloud-test-fixes 

    Refactor cloud provider tests to be more accurate
    @basepi
    basepi committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    071a611 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2015

  1. version change for latest branch

    @jacobhammons
    jacobhammons committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    b6af538 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#26663 from jacobhammons/2014.7-version 

    version change for latest branch
    @jacobhammons
    jacobhammons committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    6bd3dcc View commit details
    Browse the repository at this point in the history

  3. Doc fix. Fixes saltstack#26656

    @nmadhok
    nmadhok committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    26be189 View commit details
    Browse the repository at this point in the history

  4. Merge pull request saltstack#26667 from nmadhok/doc-fix-2014.7 

    [doc-fix] Removing special character from salt.runners.pillar and other changes
    Nicole Thomas committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    c2c7fe0 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 

    Conflicts:
    doc/conf.py
    salt/modules/win_service.py
    tests/integration/cloud/providers/digital_ocean.py
    @basepi
    basepi committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    40718af View commit details
    Browse the repository at this point in the history

  6. Remove overmocked test

    @basepi
    basepi committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    64cad37 View commit details
    Browse the repository at this point in the history

  7. Merge pull request saltstack#26681 from basepi/merge-forward-2015.5 

    [2015.5] Merge forward from 2014.7 to 2015.5
    @basepi
    basepi committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    0b17f80 View commit details
    Browse the repository at this point in the history

  8. Ensure VM name is valid before trying to create Linode VM 

    Fixes saltstack#14612
    rallytime committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    3888151 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2015

  1. Don't accept non-list input for pkgs arg

    @terminalmage
    terminalmage committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    96c3df1 View commit details
    Browse the repository at this point in the history

  2. Update openbsdpkg.py 

    * 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'
~~
    @serge-p @terminalmage
    serge-p authored and terminalmage committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    4aec926 View commit details
    Browse the repository at this point in the history

  3. Better HTTPS basic auth redaction for 2015.5 branch

    @terminalmage
    terminalmage committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    b1d2534 View commit details
    Browse the repository at this point in the history

  4. Use versioninfo tuple for comparison

    @terminalmage
    terminalmage committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    752d260 View commit details
    Browse the repository at this point in the history

  5. Merge pull request saltstack#26694 from terminalmage/bp-26693 

    Backport saltstack#26693 to 2015.5
    @s0undt3ch
    s0undt3ch committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    4040a31 View commit details
    Browse the repository at this point in the history

  6. Ignore the first element of kern.disks split, which is the sysctl name

    @kev009
    kev009 committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    3ac97f9 View commit details
    Browse the repository at this point in the history

  7. Merge pull request saltstack#26695 from terminalmage/better-https-aut… 

    …h-redaction-2015.5

Better HTTPS basic auth redaction for 2015.5 branch
    Mike Place committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    5894513 View commit details
    Browse the repository at this point in the history

  8. Added unit tests for new _validate_name function and adjusted regex

    rallytime committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    9a4228d View commit details
    Browse the repository at this point in the history

  9. Whitespace fix

    rallytime committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    a3ac8e7 View commit details
    Browse the repository at this point in the history

  10. Merge pull request saltstack#26700 from kev009/fbsd-disks-fix-2015.5 

    Ignore the first element of kern.disks split, which is the sysctl name
    @jfindlay
    jfindlay committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    24a4f54 View commit details
    Browse the repository at this point in the history

  11. versionadded and more efficient checks

    rallytime committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    bc21094 View commit details
    Browse the repository at this point in the history

  12. Update GCE driver to return True, False or a new name in __virtual__()

    rallytime committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    78e3158 View commit details
    Browse the repository at this point in the history

  13. Remove unused import

    rallytime committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    e6b7487 View commit details
    Browse the repository at this point in the history

  14. Merge pull request saltstack#26617 from terminalmage/issue9592 

    Fix Windows failures in pip module due to raw string formatting
    @basepi
    basepi committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    c3a6280 View commit details
    Browse the repository at this point in the history

  15. add exception placeholder for older msgpacks 

    Fix for saltstack#26705.
    @jfindlay
    jfindlay committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    ebcfaf9 View commit details
    Browse the repository at this point in the history

  16. Merge pull request saltstack#26709 from rallytime/fix-14612 

    Ensure VM name is valid before trying to create Linode VM
    Mike Place committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    cf487cf View commit details
    Browse the repository at this point in the history

  17. Merge pull request saltstack#26710 from rallytime/gce_virtual_return 

    Update GCE driver to return True, False or a new name in __virtual__()
    Mike Place committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    47faa8c View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. Changed import from smbconnection to smb3

    @twangboy
    twangboy committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    86f425c View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#26714 from jfindlay/pack_except 

    add exception placeholder for older msgpacks
    @basepi
    basepi committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    16d4e03 View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#26736 from twangboy/fix_21256 

    Changed import from smbconnection to smb3
    @jfindlay
    jfindlay committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    22dbce8 View commit details
    Browse the repository at this point in the history

  4. import elementree from _compat in ilo exec mod 

    Fixes saltstack#26732.
    @jfindlay
    jfindlay committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    211a027 View commit details
    Browse the repository at this point in the history

  5. Merge pull request saltstack#26753 from jfindlay/iloet 

    import elementree from _compat in ilo exec mod
    @s0undt3ch
    s0undt3ch committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    7a58878 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/2015.5' into merge-forward-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
    @basepi
    basepi committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    b509cdf View commit details
    Browse the repository at this point in the history

  7. Fix lint

    @basepi
    basepi committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    3b696d9 View commit details
    Browse the repository at this point in the history