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

Merged
merged 8 commits into from
Jul 19, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #34784

merged 8 commits into from
Jul 19, 2016

Commits on Jul 18, 2016

  1. Loop over updated keys in non recursive update 

     Remove dict.update and always use loop because this is failing for
 NamespacedDictWrapper.
    @martinhoefling
    martinhoefling authored and rallytime committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    d949110 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#34741 from rallytime/bp-34726 

    Back-port saltstack#34726 to 2015.8
    Mike Place committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    81f2900 View commit details
    Browse the repository at this point in the history

  3. Disable test 

    There's a race condition in here somewhere. Disabling and tracking issue elsewhere.
    Mike Place committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    46901c6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request saltstack#34754 from cachedout/disable_mid_test 

    Disable test
    Mike Place committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    f19caac View commit details
    Browse the repository at this point in the history

  5. Remove unnedeed config test (saltstack#34751) 

    Refs saltstack#34607
    Mike Place authored and Nicole Thomas committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    10a1af9 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2016

  1. Add jid=req handling for mysql returner. It should also store the ret… 

    …urn jid into the jid list table.
    @daveye
    daveye committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    0cd55eb View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#34773 from randomed/mysql-returner-start… 

    …up/2015.8

Bugfix: Startup states on minions are not being written to mysql returner
    Mike Place committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    5802103 View commit details
    Browse the repository at this point in the history

  3. Merge branch '2015.8' into '2016.3' 

    No conflicts.
    rallytime committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    3e032dc View commit details
    Browse the repository at this point in the history