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

Merged
merged 14 commits into from
Jun 24, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #34281

merged 14 commits into from
Jun 24, 2016

Commits on Jun 22, 2016

  1. Fix win_system.set_system_date_time 

    Previously time values could not be set to zero and would simply leave
the previous time value when attempting to set the time.
    Collin Richards committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    6286771 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2016

  1. ipset: fix commont containing blank

    C. Gao committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    344eb60 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#34232 from thegoodduke/for_2015.5_ipset 

    ipset: fix commont containing blank
    Mike Place committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    cb1e8bf View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#34225 from richardscollin/fix-win-set-da… 

    …tetime

Fix win_system.set_system_date_time
    Mike Place committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    8d5ed91 View commit details
    Browse the repository at this point in the history

  4. Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer 

    This change makes it possible for --config-dir to work from the CLI.

Fixes saltstack#34037
    rallytime committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    c4c037d View commit details
    Browse the repository at this point in the history

  5. Merge branch '2015.5' into '2015.8' 

    No conflicts.
    rallytime committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    ea914b6 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2016

  1. ipset: fix the comment containing blank

    C. Gao committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    4da5e35 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#34258 from rallytime/merge-2015.8 

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

  3. Don't escape source before calling managed

    @clinta
    clinta committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    6572454 View commit details
    Browse the repository at this point in the history

  4. Remove test that doesn't actually test anything

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

  5. Merge pull request saltstack#34274 from clinta/2015.8 

    Don't escape source before calling managed
    Mike Place committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    203870f View commit details
    Browse the repository at this point in the history

  6. Merge pull request saltstack#34257 from rallytime/fix-34037 

    Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer
    Mike Place committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    65c5675 View commit details
    Browse the repository at this point in the history

  7. Merge pull request saltstack#34233 from thegoodduke/for_2015.8_ipset 

    ipset: fix the comment containing blank
    Mike Place committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    d235b12 View commit details
    Browse the repository at this point in the history

  8. Merge branch '2015.8' into '2016.3' 

    Conflicts:
  - salt/renderers/gpg.py
  - tests/unit/renderers/gpg_test.py
    rallytime committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    ae8ad93 View commit details
    Browse the repository at this point in the history