valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,331 Commits 24 Branches 182 Tags 341 MiB
1642dba5d1
Commit Graph

62331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
fa73041a49 If the thin does not match, then redeploy, don't error 2016-07-20 14:54:57 -06:00
Thomas S Hatch
6c35d88268 Fix #34648 (#34828) 2016-07-20 14:49:52 -06:00
Thomas S Hatch
1ccf35eca4 fix beacon list to include all beacons being processed 2016-07-20 12:57:33 -06:00
Jacob Hammons
a028796eff copy spm.1 man page during setup 
Refs #25213
 2016-07-20 12:21:08 -06:00
Thomas S Hatch
b5de492143 fix #34798 2016-07-20 12:13:24 -06:00
Thomas S Hatch
5ad6bd7307 fix #34796 2016-07-20 12:05:12 -06:00
Mike Place
98fa4a404e Merge pull request #34818 from jtand/mysql_state_integration_test_cleanup 
Skip mysql state test if mysqladmin is not available
 2016-07-20 10:10:35 -06:00
Justin Anderson
9abb6f91bb Skip mysql state test if mysqladmin is not available 2016-07-20 09:24:24 -06:00
Bo Maryniuk
5f5b802c0c Add option to master config reader on ignoring system exit for wrong configuration 2016-07-20 16:32:01 +02:00
Bo Maryniuk
6fc677f177 Ignore minion config errors everywhere but the minion itself 2016-07-20 16:32:01 +02:00
Bo Maryniuk
8699194647 Remove deprecation: BaseException.message deprecated as of 2.6 2016-07-20 16:32:01 +02:00
Bo Maryniuk
0e65cfec91 Fix lint: E8302 2016-07-20 16:32:01 +02:00
Bo Maryniuk
67faa56bf1 Use Salt default exit codes instead of hard-coded values 2016-07-20 16:32:01 +02:00
Bo Maryniuk
a84556e596 Exit immediately on configuration error 2016-07-20 16:32:01 +02:00
Bo Maryniuk
43d965907c Raise an exception on any found wrong configuration file 2016-07-20 16:32:01 +02:00
Bo Maryniuk
30ed728d05 Cover exception handling in the utils.parsers 2016-07-20 16:32:01 +02:00
Bo Maryniuk
5e8c0c6bdb Introduce configuration error exception 2016-07-20 16:32:01 +02:00
Mike Place
6636f2b449 Merge pull request #34803 from junovitch/issue_24744 
salt/state.py: set `chunk['order'] = 0' with `order: first'; fixes #24744
 2016-07-20 07:56:20 -06:00
Jason Unovitch
64c850410f salt/state.py: set chunk['order'] = 0' with order: first'; fixes #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}
 2016-07-19 21:17:40 -04:00
Michael Walton
340110b4b4 Move check for rtag to outermost-nesting in function 2016-07-19 09:52:24 -04:00
Michael Walton
ac67c6b493 Lint fix 2016-07-19 09:23:23 -04:00
Mike Place
58021035a9 Merge pull request #34773 from randomed/mysql-returner-startup/2015.8 
Bugfix: Startup states on minions are not being written to mysql returner
 2016-07-19 06:39:53 -06:00
Michael Walton
0435a1375e Get rid of repetition in code by using new "refreshed" variable instead 2016-07-19 02:40:24 -04:00
Dave Ye
0cd55eb7d7 Add jid=req handling for mysql returner. It should also store the return jid into the jid list table. 2016-07-19 15:41:23 +10:00
Michael Walton
3b1dc978e2 Lint fix 2016-07-18 22:12:57 -04:00
Michael Walton
a9bd1b92b9 lint fixes 2016-07-18 21:23:00 -04:00
Michael Walton
71d69343ef Fixes #34767 2016-07-18 20:15:04 -04:00
Mike Place
10a1af9949 Remove unnedeed config test (#34751) 
Refs #34607
 2016-07-18 13:00:47 -06:00
Mike Place
f19caac8e4 Merge pull request #34754 from cachedout/disable_mid_test 
Disable test
 2016-07-18 12:40:50 -06:00
Mike Place
46901c6e65 Disable test 
There's a race condition in here somewhere. Disabling and tracking issue elsewhere.
 2016-07-18 12:39:49 -06:00
Mike Place
81f29006f2 Merge pull request #34741 from rallytime/bp-34726 
Back-port #34726 to 2015.8
 2016-07-18 12:00:22 -06:00
Martin Hoefling
d949110993 Loop over updated keys in non recursive update 
Remove dict.update and always use loop because this is failing for
 NamespacedDictWrapper.
 2016-07-18 09:55:59 -06:00
Mike Place
e9e5bbe38b Merge pull request #34721 from rallytime/fix-34703 
Add output_file option to master config docs
 2016-07-16 14:04:02 -06:00
rallytime
9c803d05a5 Add output_file option to master config docs 
Fixes #34703
 2016-07-16 12:45:55 -06:00
Mike Place
08d00f3a61 Merge pull request #34689 from Azidburn/fix_pkg_sources 
fix second run problems with pkg.installed using sources
 2016-07-15 15:19:39 -06:00
Mike Place
4cb1ded520 Merge pull request #34695 from isbm/isbm-zypper-product-boolean-values 
Bugfix: Zypper `pkg.list_products` returns False on some empty values (2015.8)
 2016-07-15 15:08:00 -06:00
Bo Maryniuk
5ed5142fbc Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:12:03 +02:00
Bo Maryniuk
21444ee240 Bugfix: return boolean only for 'isbase' and 'installed' attributes 2016-07-15 17:11:31 +02:00
Marc Thomas
2c0fc919b3 fix second run problems with pkg.installed using sources 
Fixes #32276
 2016-07-15 14:11:11 +02:00
Justin Findlay
aaa6f7d80a update 2015.8.11 release notes (#34682) 2016-07-14 15:23:26 -06:00
Mike Place
3192e1674b Merge pull request #34676 from cachedout/partial_revert_34644 
Revert "Modify lodaer global test to use populated dunders"
 2016-07-14 12:12:55 -06:00
Mike Place
64a154826a Revert "Modify lodaer global test to use populated dunders" 
This reverts commit f45dbe8508df70ce3f563915318791614449b341.
 2016-07-14 12:11:44 -06:00
Mike Place
3b6f1089b2 Merge pull request #34601 from lorengordon/clarify-doc 
Clarifies the proper way to reference states
 2016-07-14 08:20:41 -06:00
Nicole Thomas
bc63f25a6f Lint 34644 (#34651) 
* Better error handling for __virtual__ in dockerng module

* Modify lodaer global test to use populated dunders

This prevents a number of errors in the error log and makes for a
more robust test IMHO

* Lint #34644
 2016-07-13 18:58:54 -04:00
Mike Place
50360263c5 Adjust the mine test a little bit to give it a better chance of success (#34647) 2016-07-13 16:51:28 -04:00
Mike Place
8a0209101e Merge pull request #34642 from jtand/mysql_integration_cleanup 
Check that mysqladmin exists before running mysql integration tests
 2016-07-13 12:12:44 -06:00
Justin Anderson
dd1559a599 Check that mysqladmin exists before running mysql integration tests. 2016-07-13 11:08:26 -06:00
Mike Place
3e612c3794 Merge pull request #34618 from jtand/network_integration_fix 
Network state integration test test=True
 2016-07-13 10:30:15 -06:00
Nicole Thomas
9f123543e5 Merge pull request #34617 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-07-12 16:11:40 -04:00
rallytime
3026df346f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-12 13:27:16 -06:00