valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,859 Commits 24 Branches 182 Tags 341 MiB
914eb60d51
Commit Graph

68859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
5e8c0c6bdb Introduce configuration error exception 2016-07-20 16:32:01 +02:00
Mike Place
6ca9ffa7c7 Merge pull request #34683 from cachedout/issue_34215 
Fix publisher leak
 2016-07-20 07:57:10 -06: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
Bo Maryniuk
a6bcbd615f Lintfix PEP8: E262 2016-07-20 15:26:18 +02: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
Mike Place
ccd53e9214 Lint 2016-07-19 15:50:23 -06:00
Mike Place
49ab3fd2b5 Merge pull request #34791 from sjorge/zpool-state-tweaks 
salt.state.zpool tweaks
 2016-07-19 14:56:47 -06:00
Mike Place
76eb46fb08 Document master setting 2016-07-19 14:50:23 -06:00
Mike Place
0dfe3aaf31 Set up dynamic config 2016-07-19 14:45:51 -06:00
Jorge Schrauwen
d48c6d2dcb accomidate use of "fake" vdev type disk, this behavior may be broken later if a disk vdev ever gets added to the cli tools. improve documentation explaining how to create a striped pool without the "fake" vdev type 2016-07-19 21:31:31 +02:00
Mike Place
3cfb82cdd4 Fix silly error 2016-07-19 13:29:02 -06:00
Mike Place
35a845fff5 Only set IPC with write buffer if set 2016-07-19 13:24:25 -06:00
Nicole Thomas
1617a7058a Merge pull request #34784 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-19 10:30:18 -06:00
Bo Maryniuk
110a422d5a Keep osmajorrelease as a string type for 2016.3 release 2016-07-19 17:52:08 +02:00
rallytime
3e032dc397 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-19 09:30:45 -06: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
Jacob Hammons
c3ae64c054 Updates man pages (#34756) 
adds link to all tutorials to using salt section
Refs #33923
 2016-07-18 15:36:50 -06:00
Mike Place
10a1af9949 Remove unnedeed config test (#34751) 
Refs #34607
 2016-07-18 13:00:47 -06:00
Mike Place
2a9738f00d Merge pull request #34746 from rallytime/azure-version 
Update azure lib dep to match the one in cloud.clouds.msazure
 2016-07-18 12:54:40 -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
c0e2657c8e Merge pull request #34744 from jtand/test_valid_docs_fix 
Test valid docs fix
 2016-07-18 12:22:47 -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
Mike Place
b2d636017d Add IPC to minion opts 2016-07-18 11:46:52 -06:00
rallytime
ead3eb1606 Update azure lib dep to match the one in cloud.clouds.msazure 
Refs #27980
 2016-07-18 11:26:36 -06:00
Justin Anderson
4fe33a7695 add directives example to ldap3.modify 2016-07-18 11:17:24 -06:00
Justin Anderson
6fa40a0d46 Add cli examples for ldap3 module 2016-07-18 10:47:12 -06:00
Justin Anderson
b94e0dd95a ipset.long_range doesn't need a docstring 2016-07-18 10:32:32 -06:00
Nicole Thomas
d4adf98b85 Merge pull request #34740 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-18 10:28:56 -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
rallytime
7d106c78f0 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-18 09:45:00 -06:00
Mike Place
efc7599f85 Merge pull request #34607 from isbm/isbm-config-reading-exit-2016.3 
Bugfix: Exit on configuration read (backport)
 2016-07-18 09:15:21 -06:00
Mike Place
d0e0c0186b Merge pull request #34739 from cachedout/remove_config_test 
Remove unnedeed config test
 2016-07-18 09:15:15 -06:00
Mike Place
4625ee65b8 Remove unnedeed config test 
Refs #34607
 2016-07-18 09:12:18 -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
Mike Place
abf5b976ed Merge pull request #34722 from rallytime/fix-34630 
Various spelling fixes
 2016-07-16 13:49:54 -06:00
Mike Place
922cc5a8a7 Merge pull request #34714 from sjmh/fix/ldap_auth 
Fix ldap auth for function matches
 2016-07-16 13:49:12 -06:00
Nicole Thomas
40626d786a Merge pull request #34720 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-16 13:22:28 -06:00
rallytime
cca9446c37 Various spelling fixes 
Fixes #34630
 2016-07-16 13:17:09 -06:00
rallytime
9c803d05a5 Add output_file option to master config docs 
Fixes #34703
 2016-07-16 12:45:55 -06:00
Mike Place
2c1c92c48e Lint 2016-07-16 12:45:08 -06:00
rallytime
c2130d5a04 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-16 12:29:54 -06:00
Nicole Thomas
8ae4b104ff Add versionadded to "special" option in cron.present state (#34707) 
Fixes #34661
 2016-07-16 12:23:43 -06:00