valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,937 Commits 24 Branches 182 Tags 341 MiB
1c3f8e295a
Commit Graph

36937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SvenMW
1c3f8e295a Update systemd.py 
[Feature]
add the possibility to mask/unmask services with systemctl
 2014-09-19 15:29:42 +02:00
Thomas S Hatch
d88ceab872 Merge pull request #15917 from felskrone/fix_key_rotation 
Rename key_no_rotate to rotate_aes_key
 2014-09-18 14:14:18 -06:00
vs
207e4e8e8e rename the parameter in salt-key also, otherwise it will never rotate the key 2014-09-18 20:03:01 +02:00
Thomas S Hatch
176b4106df Merge pull request #15924 from techhat/cloudrunner 
Allow cloud runner to accept profile or names kwargs
 2014-09-18 11:04:55 -06:00
Thomas S Hatch
1045ea3360 Merge pull request #15925 from thatch45/jacksontj-develop 
Merge #15898
 2014-09-18 11:04:11 -06:00
Thomas S Hatch
c4ac6439ca Merge pull request #15916 from Jille/fix-file-directory-changes 
Fix file.directory in test mode to show all the changes instead of just one
 2014-09-18 10:32:54 -06:00
Thomas S Hatch
35e49a541f lint fix 2014-09-18 10:31:03 -06:00
Thomas S Hatch
21985cdbcc Merge branch 'develop' of https://github.com/jacksontj/salt into jacksontj-develop 2014-09-18 10:30:24 -06:00
Thomas S Hatch
b4838b2bbf Merge pull request #15919 from kostko/add-docker-cap 
Added support for capabilities in docker state
 2014-09-18 10:28:01 -06:00
Thomas S Hatch
c1579ed259 Merge pull request #15915 from Jille/improve-15771 
Improved fix for the newline at the end of crontabs
 2014-09-18 10:27:20 -06:00
Thomas S Hatch
da5e07052a Merge pull request #15912 from tankywoo/develop 
Fix #15862 remove dirs in keep list when walk path
 2014-09-18 10:24:57 -06:00
Joseph Hall
87901b42ba Allow cloud runner to accept profile or names kwargs 2014-09-18 10:24:26 -06:00
Mike Place
0b99bcd3af Merge pull request #15918 from felskrone/con_cache_documentation 
add documentation for the con_cache setting in master config
 2014-09-18 09:19:54 -06:00
Jernej Kos
2d73de9825 Added support for capabilities in docker state. 2014-09-18 15:09:26 +02:00
vs
ae07fe381b add documentation for the con_cache setting in master config 2014-09-18 14:26:49 +02:00
vs
da78c38b97 add rotate_aes_key documentation to master-configuration reference 2014-09-18 13:57:38 +02:00
Jille Timmermans
0c155b1cb1 Fix file.directory in test mode to show all the changes (user, group and/or mode) instead of just one 2014-09-18 13:52:46 +02:00
vs
9ac714dc45 rename key_no_rotate to rotate_aes_key 2014-09-18 13:45:38 +02:00
vs
94957630b4 add rotate_aes_key option to config 2014-09-18 13:43:23 +02:00
Jille Timmermans
a71a8fb96d Improved fix for the newline at the end of crontabs 
Fixes issue #15699 and improves PR #15771
 2014-09-18 13:16:04 +02:00
Tanky Woo
a10c782e27 Fix #15862 remove dirs in keep list when walk path 2014-09-18 17:52:52 +08:00
Thomas S Hatch
67b13d9c05 Merge pull request #15902 from hroussez/fix-compound-delimiter 
Fix delimiter on _check_compound_minions
 2014-09-18 00:38:35 -06:00
Thomas S Hatch
af504f12a4 Merge pull request #15899 from garethgreenaway/adding_globbing_sysmod 
Additions to sysmod.py module
 2014-09-18 00:36:22 -06:00
Thomas S Hatch
bd803e32f8 Merge pull request #15884 from thanatos/use-octal 
Use octal.
 2014-09-18 00:32:57 -06:00
Gareth J. Greenaway
a106697266 missed one. 2014-09-17 21:14:19 -07:00
Gareth J. Greenaway
f74bc2d1cf fixing lint issues 2014-09-17 19:54:40 -07:00
Gareth J. Greenaway
2c2cba00b3 Adding globbing ability to all documentation related functions in the sysmod module. 2014-09-17 18:38:40 -07:00
Thomas Jackson
fb2cb359d7 Remove the sleep, there is a better way to fix this 
The problem you are running into is that since this is a daemon process when the function ends its effectively interpreter shutdown (which doesn't have to destroy all objects). By forcing the del of event it will call destroy() which sets linger and waits some period of time. This will speed up some process deaths (if zmq is quick enough) and stay around longer (potentially) if it can't send.
 2014-09-17 17:51:51 -07:00
Thomas Jackson
a777a0d484 Don't fire events for runner/wheel execution in the reactor 
This creates more or less infinite loops if you have an entry in the reactor conf that acts on all events.

Yo dawg, I heard you liked events... :)
 2014-09-17 17:34:51 -07:00
Henri Roussez
d67173a96c add delimiter capability to _check_compound_minions 2014-09-17 17:14:42 -07:00
Thomas S Hatch
022d909e8d Merge pull request #15885 from askholme/develop 
fix outdated documentation in dockerio
 2014-09-17 15:04:50 -06:00
Ask Holme
13da15bd32 fix outdated documentation 2014-09-17 22:41:06 +02:00
Thomas S Hatch
7ac514e879 Merge pull request #15875 from garethgreenaway/disable_state_runs 
Changes to state.py module to allow disabling state runs.
 2014-09-17 14:33:04 -06:00
Thomas S Hatch
bc2c4f876b Merge pull request #15871 from graingert/patch-2 
Fix salt.states.rabbitmq_plugin:disabled.__doc__
 2014-09-17 14:32:03 -06:00
Roy Wellington Ⅳ
a492c53ba6 Use octal. 
Since it's a permission. I can't do decimal -> octal -> unix perms in my head.
 2014-09-17 13:31:15 -07:00
Thomas S Hatch
8ace732052 Merge pull request #15861 from kostko/revert-15550 
Unbreak salt-ssh highstate TypeError
 2014-09-17 14:28:57 -06:00
Thomas S Hatch
fb50b05574 Merge pull request #15860 from kostko/fix-salt-ssh-ret 
Fix salt-ssh return value handling
 2014-09-17 14:15:37 -06:00
Thomas S Hatch
91769fbdbd Merge pull request #15849 from jacksontj/develop 
Add a comment explaining the except
 2014-09-17 14:14:43 -06:00
Thomas S Hatch
16ede267f5 Merge pull request #15837 from nmadhok/fix-doc 
Fix doc salt.states.file
 2014-09-17 14:10:26 -06:00
Joseph Hall
9466dba1ce Merge pull request #15835 from wesleylancel/digital-ocean-api-v2 
Add support for Digital Ocean's API v2
 2014-09-17 14:07:29 -06:00
Nicole Thomas
ce02ad59fd Merge pull request #15877 from s0undt3ch/develop 
Correct `--output-file-append` test
 2014-09-17 13:23:13 -06:00
Pedro Algarvio
8e3f9963cb Correct --output-file-append test 2014-09-17 19:40:58 +01:00
Gareth J. Greenaway
a948da60d5 First pass at adding functionality to disable state runs. These can be highstate, sls files or state functions. 2014-09-17 11:10:33 -07:00
Thomas Grainger
59731615f3 Fix salt.states.rabbitmq_plugin:disabled.__doc__ 2014-09-17 18:00:32 +01:00
Nicole Thomas
95d2ee79d6 Merge pull request #15865 from techhat/issue15831 
Cleanup from issue #15831
 2014-09-17 08:36:49 -06:00
Joseph Hall
d398082de4 Cleanup from issue #15831 2014-09-17 07:59:02 -06:00
Joseph Hall
eaae71889d Merge pull request #15831 from ror6ax/devmap 
devmap module added
 2014-09-17 07:53:02 -06:00
Pedro Algarvio
32868c6561 Merge pull request #15858 from cvrebert/patch-1 
salt.output.nested: rm unused import of sys module
 2014-09-17 12:14:41 +01:00
Pedro Algarvio
edd364c781 Merge pull request #15859 from cvrebert/patch-2 
salt.utils.process: rm duplicate import of signal module
 2014-09-17 08:05:33 +01:00
Jernej Kos
22191e61d5 Revert commit 1a90b5f. 2014-09-17 09:03:38 +02:00