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,348 Commits 24 Branches 182 Tags 341 MiB
673e1aa1aa
Commit Graph

62348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
8becec2f4f Backport #34906 2016-07-22 17:22:50 -06:00
Mike Place
6ccc27f697 Merge pull request #34898 from hrumph/list_upgrades_refresh 
Stop multiple refreshes during call to pkg.list_upgrades
 2016-07-22 16:28:42 -06:00
Michael Walton
acd4b1a23b Fixes #33620 2016-07-22 15:46:29 -04:00
Thomas S Hatch
5c13ee0e72 Merge pull request #34606 from isbm/isbm-config-reading-exit-2015.8 
Bugfix: Exit on configuration read (backport)
 2016-07-22 11:35:18 -06:00
Thomas S Hatch
fb223e1bd4 Invalidate the target cache very quickly (#34862) 2016-07-22 09:34:08 -06:00
Erik Johnson
1ca1367289 Fail git.latest states with uncommitted changes when force_reset=False (#34869) 
* Add git.diff function

* Fail git.latest states with uncommitted changes when force_reset=False

Also, discard these changes when running the state if force_reset=True.

* Add integration test for case where there are uncommitted changes
 2016-07-22 09:04:05 -06:00
Mike Place
4f4381e5b9 Merge pull request #34859 from cachedout/fix_wheel_test 
Fix wheel test
 2016-07-21 13:55:25 -06:00
Mike Place
b4be66dedf Fix wheel test 
Fix random ordering bug
 2016-07-21 13:54:32 -06:00
Mike Place
acc9e31c02 Merge pull request #34822 from thatch45/ssh_fixes 
Fix salt-ssh state.high and state.low
 2016-07-21 13:16:19 -06:00
Thomas S Hatch
5d91139bc9 Merge pull request #34847 from cachedout/pwall 
Add an option to skip the verification of client_acl users
 2016-07-21 11:55:55 -06:00
Michael Walton
e0b6261659 changed name of varibale 'refreshed' to 'was_refreshed' 2016-07-21 13:44:49 -04:00
Mike Place
2c8298dc6e Profile logging 2016-07-21 09:54:52 -06:00
Mike Place
3affafa2e9 Add an option to skip the verification of client_acl users 2016-07-21 09:51:45 -06:00
Mike Place
07d1d36653 Merge pull request #34827 from thatch45/34691 
fix beacon list to include all beacons being processed
 2016-07-21 08:49:56 -06:00
Mike Place
b375720251 Merge pull request #34833 from rallytime/bp-28521 
Back-port #28521 to 2015.8
 2016-07-21 08:37:24 -06:00
Gleb Goncharov
e50a6783ce SPM: packaging doesn't work in Python 2.6. Fixed. 2016-07-20 15:02:08 -06:00
Nicole Thomas
042646582f Merge pull request #34823 from rallytime/bp-25276 
Back-port #25276 to 2015.8
 2016-07-20 14:56:04 -06:00
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