Commit Graph

38562 Commits

Author SHA1 Message Date
Thomas S Hatch
77fae8821b Merge pull request #16731 from thatch45/mod_agg_prop
Send the state_aggregate option down
2014-10-17 15:53:55 -06:00
Thomas S Hatch
0abcbb437d Merge pull request #16730 from thatch45/wipe_on_rand
Add -W option to --rand-thin-dir making it easier
2014-10-17 15:53:41 -06:00
Thomas S Hatch
c21033e8e4 Merge pull request #16726 from techhat/sqlite
Correct documentation for sqlite returner
2014-10-17 15:53:12 -06:00
Thomas S Hatch
13557d3fa2 Merge pull request #16724 from etuttle/gitfs-auth-params
gitfs: accept per-remote auth params (fixes #16698)
2014-10-17 15:52:54 -06:00
Thomas S Hatch
aca65c0bca Merge pull request #16721 from thatch45/16702
Add error checks to highstate per #16702
2014-10-17 15:52:09 -06:00
Thomas S Hatch
b37cc43a89 one star, and lint! 2014-10-17 15:48:23 -06:00
Thomas S Hatch
45a8334a9a Allow extra file refs to be defined in opts and saltfile per #9878 2014-10-17 15:44:27 -06:00
Thomas S Hatch
06beafed78 Merge pull request #16704 from cimarronm/mac_user_group_release_bugfix
Bug in os relase version comparison for OSX user and group modules
2014-10-17 15:29:13 -06:00
Thomas S Hatch
87bbf089f4 Merge pull request #16728 from cachedout/issue_16271
Don't refresh in state.pkg
2014-10-17 15:28:20 -06:00
Thomas S Hatch
18e17ac817 remove option for now defunct --no-minion-cache 2014-10-17 15:26:59 -06:00
Thomas S Hatch
84a7d247a5 send down the state_aggregate opts durring state runs 2014-10-17 15:08:12 -06:00
Thomas S Hatch
dcced9a566 pack in the state_aggregate option 2014-10-17 15:05:21 -06:00
Thomas S Hatch
f80a420947 Add -W option to --rand-thin-dir making it easier
Also make the rand-thin-dir wipe up after itself
2014-10-17 14:42:52 -06:00
Thomas S Hatch
c2ae87f7a2 Merge pull request #16729 from hulu/monit-shadowing
Avoid shadowing within monit module
2014-10-17 14:36:53 -06:00
vs
0c2a8b6398 pylint fixes 2014-10-17 22:17:11 +02:00
Chris Rebert
acd22fc795 Avoid shadowing within monit module
salt/modules/monit.py:114: [W0621(redefined-outer-name), summary] Redefining name 'status' from outer scope (line 123)
2014-10-17 13:13:44 -07:00
Mike Place
52d5c886e7 Don't refresh in state.pkg
Fixes #16271
2014-10-17 13:51:52 -06:00
Thomas S Hatch
5a00ba04d2 Merge pull request #16725 from thatch45/ssh_ext_pillar
salt-ssh ext_pillar is a go!
2014-10-17 13:31:56 -06:00
Joseph Hall
10c68d9c2a Correct documentation for sqlite returner 2014-10-17 13:30:28 -06:00
Thomas S Hatch
e0a8bdd425 Pass pillar dirs into compile_pillar 2014-10-17 12:31:07 -06:00
Thomas S Hatch
07652ed0e6 Add raw check for errors in pkg lowstate 2014-10-17 11:34:47 -06:00
Thomas S Hatch
f5ac985c96 check for errors in wrapper highstate compiled state 2014-10-17 11:28:00 -06:00
Thomas S Hatch
f8956fca55 Merge pull request #16716 from rallytime/bp-16613
Backport #16613 to 2014.7
2014-10-17 11:00:24 -06:00
Thomas S Hatch
180d1d7712 Merge pull request #16719 from thatch45/16571
Add status function to monit - merge #16571 in to develop
2014-10-17 11:00:02 -06:00
Thomas S Hatch
d18e5c4b29 Merge pull request #16715 from whiteinge/reactor-cmd-local-method
Rename the cmd method in the Reactor to local for consistency
2014-10-17 10:59:16 -06:00
Thomas S Hatch
986d6a3f08 Merge pull request #16708 from babilen/dev-pecl-list
Make PECL channel listing more robust
2014-10-17 10:58:22 -06:00
Thomas S Hatch
b4db08e4b9 Merge pull request #16706 from whiteinge/salt-api_gen-keys-download
Added convenience URL to generate minion keys and download as a tarball
2014-10-17 10:57:04 -06:00
Thomas S Hatch
9abe02fad4 Merge pull request #16703 from whiteinge/orchestrate-runner-wheel
Added functions to execute runner and wheel functions from orchestrate
2014-10-17 10:53:23 -06:00
Thomas S Hatch
0847b0dc16 Merge pull request #16699 from garethgreenaway/develop
Additions to schedule
2014-10-17 10:52:27 -06:00
Thomas S Hatch
7a72ef2e27 Merge pull request #16688 from Supermathie/16682
Add documentation addressing how to listen for events on minion
2014-10-17 10:51:57 -06:00
Thomas S Hatch
70d43b3c7f Merge pull request #16669 from felskrone/fix_status_master
master.status broken in develop
2014-10-17 10:47:01 -06:00
Thomas S Hatch
d8b9aa3335 Merge pull request #16646 from garethgreenaway/16618_2014_7_mount_hash_notation
Fixes to mount state
2014-10-17 10:40:37 -06:00
Thomas S Hatch
5ceaa7a4e9 Merge pull request #16632 from lyft/iam-policies-from-pillars
Add a policies_from_pillars argument to boto_iam_role.present
2014-10-17 10:40:02 -06:00
Thomas S Hatch
4ca7e44224 Add status function to monit - merge #16571 in to develop 2014-10-17 10:36:07 -06:00
Thomas S Hatch
f1bebf20da Merge pull request #16521 from cachedout/gen_jid
Add prep_jid to returners
2014-10-17 10:33:38 -06:00
Cimarron Mittelsteadt
d6abb6c77d TST: Updated mac_user tests for modifications to OS release handling 2014-10-17 09:28:56 -07:00
Thomas S Hatch
913394e5c4 Merge pull request #16718 from UtahDave/develop
pillar_opts defaults to False in develop now
2014-10-17 10:21:22 -06:00
David Boucha
6406078240 pillar_opts defaults to False in develop now 2014-10-17 10:18:59 -06:00
Pedro Algarvio
40256b7736 Merge pull request #16717 from terminalmage/update-spec
Update Fedora/RHEL spec for 2014.1.13
2014-10-17 16:51:27 +01:00
Erik Johnson
33a74e422e Update Fedora/RHEL spec for 2014.1.13 2014-10-17 10:46:14 -05:00
Mike Place
342f356ef3 More lint 2014-10-17 09:40:40 -06:00
Mike Place
4ec8876379 Lint 2014-10-17 09:40:40 -06:00
Mike Place
bf695c413f New onchanges/onfail failure types for requisite resolver
Refs #16370
2014-10-17 09:40:40 -06:00
Seth House
4846dcebbd Update the Reactor docs to use the local method instead of cmd 2014-10-17 09:17:34 -05:00
Seth House
df6921ee26 Rename the cmd method in the Reactor to local for consistency
Also provide a backward-compat alias.
2014-10-17 09:15:26 -05:00
Joseph Hall
3996a999b5 Merge pull request #16700 from whiteinge/json-output-indent
Fix --out-indent for the JSON outputter
2014-10-17 05:44:46 -06:00
Wolodja Wentland
f98f77cd75 Make PECL channel listing more robust
The code as it was heavily relied on a very specific output format. This patch
makes the data processing more robust against errors caused by unexpected
output.
2014-10-17 11:20:24 +02:00
Seth House
c91cc43c61 Added missing CLI example 2014-10-17 02:53:16 -05:00
Seth House
9b399d232f Added convenience URL to generate minion keys and download as a tarball
Closes #16597.
2014-10-17 02:42:15 -05:00
Cimarron Mittelsteadt
d1da1a0b3b BUG: fixes a bug where the check for versions numbers fails to work for versions a.b where b>=10 2014-10-16 22:50:30 -07:00