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

Merged
merged 5 commits into from
Jul 20, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #34824

merged 5 commits into from
Jul 20, 2016

Commits on Jul 20, 2016

  1. salt/state.py: set chunk['order'] = 0' with order: first'; fixes sa… 

    …ltstack#24744

Currently the `order: first' keyword executes later states without order
options. Consider a test case such as:

```SaltStack
sleep 1:
  cmd.run:
    - order: first
sleep 2:
  cmd.run
sleep 3:
  cmd.run
sleep 4:
  cmd.run:
    - order: last
```

The contents of each chunk dictionary at runtime show that the 'first' state
is not evaluated to 'first'.

{'name': 'sleep 4', 'state': 'cmd', '__id__': 'sleep 4', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 1010100}
{'name': 'sleep 2', 'state': 'cmd', '__id__': 'sleep 2', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10000}
{'name': 'sleep 3', 'state': 'cmd', '__id__': 'sleep 3', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10001}
{'name': 'sleep 1', 'state': 'cmd', '__id__': 'sleep 1', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10100}
    @junovitch
    junovitch committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    64c8504 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#34803 from junovitch/issue_24744 

    salt/state.py: set `chunk['order'] = 0' with `order: first'; fixes saltstack#24744
    Mike Place authored Jul 20, 2016
    Configuration menu
    Copy the full SHA
    6636f2b View commit details
    Browse the repository at this point in the history

  3. Skip mysql state test if mysqladmin is not available

    Justin Anderson committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    9abb6f9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request saltstack#34818 from jtand/mysql_state_integration… 

    …_test_cleanup

Skip mysql state test if mysqladmin is not available
    Mike Place authored Jul 20, 2016
    Configuration menu
    Copy the full SHA
    98fa4a4 View commit details
    Browse the repository at this point in the history

  5. Merge branch '2015.8' into '2016.3' 

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