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 #31549

Merged
merged 14 commits into from Feb 29, 2016
Merged

[2015.8] Merge forward from 2015.5 to 2015.8 #31549

merged 14 commits into from Feb 29, 2016

Commits on Feb 24, 2016

  1. Set auth retry count to 0 if multimaster mode is failover. 

    Backport of PR saltstack#31382 into 2015.5.
    Dmitry Kuzmenko committed Feb 24, 2016
    Copy the full SHA
    3d09c3b View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#31461 from DSRCompany/issues/30183_fix_m… 

    …ultimaster_failover_2015.5

Set auth retry count to 0 if multimaster mode is failover.
    Mike Place committed Feb 24, 2016
    Copy the full SHA
    f35e2dd View commit details
    Browse the repository at this point in the history

  3. Update contributing docs

    rallytime committed Feb 24, 2016
    Copy the full SHA
    5871e4d View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2016

  1. Merge pull request saltstack#31472 from rallytime/update-contributing… 

    …-docs

Update contributing docs
    Mike Place committed Feb 25, 2016
    Copy the full SHA
    da001bc View commit details
    Browse the repository at this point in the history

  2. Remove duplicate "timeout" definition in Roster docs

    rallytime committed Feb 25, 2016
    Copy the full SHA
    83e6480 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2016

  1. Merge pull request saltstack#31497 from rallytime/remove-timeout-dup 

    Remove duplicate "timeout" definition in Roster docs
    Mike Place committed Feb 26, 2016
    Copy the full SHA
    92f8f89 View commit details
    Browse the repository at this point in the history

  2. Add ability to specify an alternate base dir for file caching 

    This commit extends the fileclient such that it is possible to override
the base directory for file caching. The new "cachedir" param can be
either a relative path or an absolute path. If it is relative, the path
will be appended to __opts__['cachedir'], and if it is absolute then it
will take the place of __opts__['cachedir'].
    @terminalmage
    terminalmage committed Feb 26, 2016
    Copy the full SHA
    c3f7a2f View commit details
    Browse the repository at this point in the history

  3. Accept and pass through the alternate cachedir when prepping the thin… 

    … tar
    @terminalmage
    terminalmage committed Feb 26, 2016
    Copy the full SHA
    65bdcb3 View commit details
    Browse the repository at this point in the history

  4. Update the SSH state module wrappers to pass an alternate cachedir

    @terminalmage
    terminalmage committed Feb 26, 2016
    Copy the full SHA
    0320494 View commit details
    Browse the repository at this point in the history

  5. Update cp module salt-ssh wrapper to use new cachedir param

    @terminalmage
    terminalmage committed Feb 26, 2016
    Copy the full SHA
    d9370a8 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2016

  1. Add fileclient tests

    @terminalmage
    terminalmage committed Feb 29, 2016
    Copy the full SHA
    0d352bb View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#31521 from terminalmage/issue24753 

    salt-ssh: Fix race condition when caching files to build the thin tarball
    Mike Place committed Feb 29, 2016
    Copy the full SHA
    060a60f View commit details
    Browse the repository at this point in the history

  3. Merge branch '2015.5' into '2015.8' 

    Conflicts:
  - salt/client/ssh/state.py
  - salt/fileclient.py
  - salt/minion.py
    rallytime committed Feb 29, 2016
    Copy the full SHA
    24505d2 View commit details
    Browse the repository at this point in the history

  4. Pylint fix

    rallytime committed Feb 29, 2016
    Copy the full SHA
    b683df9 View commit details
    Browse the repository at this point in the history