valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,645 Commits 24 Branches 182 Tags 341 MiB
a2aae987a6
Commit Graph

68645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
650674d14a Merge pull request #34844 from vutny/fix-grains-load-in-config-init 
Fix getting total available memory without `psutil` installed
 2016-07-21 11:12:37 -06:00
rallytime
15b4f5a8b3 Skip GCE unit tests - causes test suite to hang 2016-07-21 10:53:00 -06:00
Nicole Thomas
59fffa86bc Update release notes for 2016.3.2 (#34848) 2016-07-21 10:02:01 -06: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
Mike Place
52a95b2ea3 Merge pull request #34837 from thatch45/34345 
Fix #34345
 2016-07-21 08:36:15 -06:00
Mike Place
96450ac74d Merge pull request #34838 from thatch45/unless_valid 
Check if a valid value is passed to unlyif/unless
 2016-07-21 08:34:29 -06:00
Mike Place
3a5ef86d58 Merge pull request #34840 from thatch45/state_update_ssh 
update the state wrapper to include show_low_sls
 2016-07-21 08:34:02 -06:00
Mike Place
5f67318fd7 Merge pull request #34842 from sjorge/2016.3-zpool-simplifaction 
2016.3 zpool cleanup and fixes
 2016-07-21 08:32:55 -06:00
Denys Havrysh
4dc7827020 Fix comment in master config, prevents the service from starting 2016-07-21 15:43:48 +03:00
Denys Havrysh
b4cfebb107 Fix Salt failure after merge of #34683 2016-07-21 15:03:54 +03:00
Jorge Schrauwen
a7ff9524b0 drop parsing of vdevs, error passthrough from zpool cli 2016-07-21 01:07:20 +02:00
Jorge Schrauwen
25d6c8139b eliminate hardcoded vdev type from zpool state 2016-07-21 00:53:45 +02:00
Thomas S Hatch
77dce3920c update the state wrapper to include show_low_sls 2016-07-20 16:40:13 -06:00
Jorge Schrauwen
47b8dc946c salt.states.zpool - work with updates exec module 2016-07-21 00:38:35 +02:00
Jorge Schrauwen
a5a98845c7 salt.module.zpool - fix bug with properties on/off being parsed as true/false 2016-07-21 00:28:23 +02:00
Thomas S Hatch
1f34299a84 Check if a valid value is passed to unlyif/unless 2016-07-20 16:20:58 -06:00
Thomas S Hatch
1e8c585cd3 Fix #34345 2016-07-20 15:55:18 -06:00
Jorge Schrauwen
dd64494a19 salt.modules.zpool - drop vdev types to make it more future proof, fallback to zpool cli error messages 2016-07-20 23:43:47 +02: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
7bda166e9d keep this beacon from stack tracing at the loader (#34825) 2016-07-20 14:55:22 -06:00
Nicole Thomas
b9db0b0036 Merge pull request #34824 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-20 14:54:35 -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
rallytime
094731f4b6 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-20 12:32:08 -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
Mike Place
62ef8fdb35 Merge pull request #34670 from isbm/isbm-osmajorrelease-grain-suse 
Add "osmajorrelease" grain (2016.3)
 2016-07-20 08:39:38 -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
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