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

[2016.3] Merge forward from 2015.8 to 2016.3 #33945

Merged
merged 24 commits into from
Jun 13, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #33945

merged 24 commits into from
Jun 13, 2016

Commits on May 29, 2016

  1. solve AttributeError: 'module' object has no attribute 'exception'

    Rolf Fokkens committed May 29, 2016
    Configuration menu
    Copy the full SHA
    eaf42ca View commit details
    Browse the repository at this point in the history

  2. solve' TypeError: expected string or buffer' in json/decoder.py

    Rolf Fokkens committed May 29, 2016
    Configuration menu
    Copy the full SHA
    1dd15a6 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2016

  1. Merge pull request saltstack#33611 from TargetHolding/2015.5 

    2015.5
    Mike Place committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    137f0b1 View commit details
    Browse the repository at this point in the history

  2. glance.warn_until shouldn't be checked for a doc string

    Justin Anderson committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    ebee8a8 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2016

  1. Merge pull request saltstack#33726 from jtand/sysmod_skip_valid_docs_… 

    …glance

glance.warn_until shouldn't be checked for a doc string
    Mike Place committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    b913332 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2016

  1. Fix minor docstring issues 

    The network.get_bufsize function requires an interface for arg. In the
example, the argument is missing and the function name is a little bit
off. Add arbitrary 'eth0' for argument and correct the name.
    @sacren
    sacren committed Jun 5, 2016
    Configuration menu
    Copy the full SHA
    a5fb6d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2016

  1. Merge pull request saltstack#33778 from sodium-chloride/2015.5-2016-0… 

    …604-1938

Fix minor docstring issues
    Mike Place committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    fa983e9 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. Support extraction of XZ archives in archive.extracted state 

    Using an XZ-compressed archive with archive.extracted raises a
tarfile.ReadError exception, as only gzip and bzip2 are supported by
tarfile. This commit catches that exception and attempts to extract
using xz-utils, if present.

It also makes some clarifications and corrections to the documentation.
    @terminalmage
    terminalmage committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    897a716 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#33814 from terminalmage/archive-extracte… 

    …d-xz

Support extraction of XZ archives in archive.extracted state
    Mike Place committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    e061788 View commit details
    Browse the repository at this point in the history

  3. Update versionchanged directive 

    This change did not make it into 2015.5.11, and it is not certain at
this time whether or not we will do a 2015.5.12.
    @terminalmage
    terminalmage committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    f7028eb View commit details
    Browse the repository at this point in the history

  4. Support syncing pillar modules to masterless minions 

    Resolves saltstack#33645.
    @terminalmage
    terminalmage committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    91745c2 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2016

  1. Merge pull request saltstack#33833 from terminalmage/issue33645 

    Support syncing pillar modules to masterless minions
    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    b8e6c14 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#33829 from terminalmage/update-versionch… 

    …anged

Update versionchanged directive
    Mike Place committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    cdda593 View commit details
    Browse the repository at this point in the history

  3. Merge branch '2015.5' into '2015.8' 

    Conflicts:
  - salt/modules/saltutil.py
  - salt/states/archive.py
    rallytime committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    b8e4706 View commit details
    Browse the repository at this point in the history

  4. Fix ret return from merge-conflict resolution

    rallytime committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    398534a View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2016

  1. utils.http.query: also except gaierror with tornado

    @jfindlay
    jfindlay committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    1f9422e View commit details
    Browse the repository at this point in the history

  2. modules.random_org unit tests: skip if random.org down

    @jfindlay
    jfindlay committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    82f9542 View commit details
    Browse the repository at this point in the history

  3. modules.random_org._query: only return text if present

    @jfindlay
    jfindlay committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    6acee3c View commit details
    Browse the repository at this point in the history

  4. Merge pull request saltstack#33877 from rallytime/merge-2015.8 

    [2015.8] Merge forward from 2015.5 to 2015.8
    Nicole Thomas committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    ef6da0b View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2016

  1. Wait for up to a minute for sync_after_install (saltstack#33917)

    @techhat
    techhat authored and Nicole Thomas committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    91a2184 View commit details
    Browse the repository at this point in the history

  2. Add connecting_settings to boto_elb state attributes list (saltstack#… 

    …33936)

Refs saltstack#31499
    Nicole Thomas authored Jun 10, 2016
    Configuration menu
    Copy the full SHA
    2dc1914 View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#33888 from jfindlay/random_check 

    random.org checks
    Mike Place authored Jun 10, 2016
    Configuration menu
    Copy the full SHA
    378dd7c View commit details
    Browse the repository at this point in the history

  4. Correct issue with ping on rotate with minion cache (saltstack#33765) 

    Only check connected minions if we have the data to do so. Closes saltstack#29525
    Mike Place authored and Nicole Thomas committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    b3ec39d View commit details
    Browse the repository at this point in the history

  5. Merge branch '2015.8' into '2016.3' 

    Conflicts:
  - salt/modules/saltutil.py
    rallytime committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    b4ab322 View commit details
    Browse the repository at this point in the history