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
2,816 Commits 24 Branches 182 Tags 341 MiB
a94452fb5e
Commit Graph

2816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
088bdc26f5 spelling/grammar corrections 2012-02-01 14:09:25 -06:00
Thomas S Hatch
3d56761382 Merge pull request #624 from chjohnst/59f61b04680baf1c3aa6b22b92a9640b84ffce03 
Docs are not correct with network.ping as args are not supported
 2012-02-01 11:09:27 -08:00
Christopher Johnston
5cbc0bfac5 add saltversion grain 2012-02-01 10:12:44 -08:00
Christopher Johnston
59f61b0468 args not support with network.ping 2012-02-01 09:25:27 -08:00
Thomas S Hatch
e7505e05aa Merge pull request #622 from chjohnst/develop 
add support for network_io_counters and disk_io_counters from psutils
 2012-02-01 08:01:31 -08:00
Christopher Johnston
252c26fb6d add support for network_io_counters and disk_io_counters from psutils 2012-02-01 07:54:45 -08:00
Thomas S Hatch
8ce33d72ea clean up a too long line 2012-01-31 23:39:56 -07:00
Thomas S Hatch
c295899f85 Ad initial docs for the jobs interface 2012-01-31 23:27:09 -07:00
Thomas S Hatch
0d524920e7 move the ec2 bootstrap into tutorials 2012-01-31 22:35:50 -07:00
Thomas S Hatch
3bbbdf7545 remove extra environments from matching when env is static 2012-01-31 22:25:51 -07:00
Thomas S Hatch
7e9cc5e50e Add environment to the minion config 2012-01-31 22:21:06 -07:00
Thomas S Hatch
6c57bc7fc4 Minor style cleanup in the state compiler 2012-01-31 22:04:30 -07:00
Thomas S Hatch
33ba81fa30 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-01-31 21:47:50 -07:00
Thomas S Hatch
f501b8e836 Add initial support for minion configured state environment 2012-01-31 21:47:26 -07:00
Thomas S Hatch
7350766473 Merge pull request #621 from akoumjian/develop 
Adding ec2 cloud-init bootstrap docs
 2012-01-31 20:36:02 -08:00
Alec Koumjian
8372ee5fd4 Adding ec2 cloud-init bootstrap docs 2012-01-31 20:33:39 -08:00
Thomas S Hatch
0f776c13be Add top file doc 2012-01-31 18:37:33 -07:00
Thomas S Hatch
6425dd1bb6 update grains doc 2012-01-31 17:05:42 -07:00
Thomas S Hatch
770bcc2c9f Merge pull request #620 from akoumjian/patch-1 
Telling users where to place their custom grains (_grains). Also, what a...
 2012-01-31 16:00:54 -08:00
Thomas S Hatch
7cac990a70 Make grains reload automatically as well 2012-01-31 16:57:19 -07:00
Alec Koumjian
5b0b277a5e Telling users where to place their custom grains (_grains). Also, what actions sync the grains 2012-01-31 15:53:48 -08:00
Thomas S Hatch
d98424206f changing the location of the full command log 2012-01-31 14:45:54 -07:00
Thomas S Hatch
821b8e3629 Add a log message when jobs are published 2012-01-31 14:34:40 -07:00
Thomas S Hatch
9d55628dad update string to use format in publisher 2012-01-31 14:22:12 -07:00
Thomas S Hatch
4799a80ca9 grains were only matching strings! 2012-01-31 13:17:31 -07:00
Thomas S Hatch
ae24e707f3 Take FreeBSD out of the service module 2012-01-31 11:08:16 -07:00
Jeff Schroeder
8b2c90528d Merge pull request #617 from jcollie/issue616 
Fix issue #616 - incomplete merge of salt/modules/yumpkg.py
 2012-01-31 06:41:41 -08:00
Jeffrey C. Ollie
e66c83d1f7 Fix issue #616 - incomplete merge of salt/modules/yumpkg.py 2012-01-31 07:42:11 -06:00
Thomas S Hatch
a58072620b raise default publish timeout 2012-01-30 15:53:25 -07:00
Thomas S Hatch
6a8e09b634 make the compond command check for lists and tuples in the fun 2012-01-30 13:12:47 -07:00
Thomas S Hatch
3f9e2536fa Merge pull request #609 from archtaku/develop 
added notes on ID declaration uniqueness
 2012-01-30 11:47:26 -08:00
Erik Johnson
3511018dd2 slight grammatical change 2012-01-30 13:23:00 -06:00
Erik Johnson
3d2cf86a0c corrected previous commit 2012-01-30 13:21:06 -06:00
Erik Johnson
6020c6b4aa added note about ID declaration uniqueness 2012-01-30 13:11:27 -06:00
Thomas S Hatch
d4e9dec4b3 Merge pull request #606 from archtaku/develop 
need empty line before code blocks. added ones that were missing.
 2012-01-30 09:26:31 -08:00
Erik Johnson
84cd002e64 need empty line before code blocks. added ones that were missing. 2012-01-30 11:25:08 -06:00
Thomas S Hatch
5409ff1f43 fix typo in minion config template 2012-01-30 07:55:02 -07:00
Thomas S Hatch
c637bb7ce7 Merge pull request #603 from epoelke/develop 
add logging to salt-key using salt logging framework.
 2012-01-30 06:28:52 -08:00
Eric Poelke
9821f817e8 add logging to salt-key using salt logging framework. 
Updated salt-key to log actions related to accept/delete/reject of keys.  Default log path is /var/log/salt/key.log, but can be changed with --logfile option at command line, or by setting opts['logfile'].
 2012-01-29 22:00:37 -08:00
Jeff Schroeder
9bcb3bb513 Merge pull request #602 from archtaku/develop 
State-related documentation changes
 2012-01-29 18:53:07 -08:00
Erik Johnson
6a6ca5f753 added missing period 2012-01-29 20:08:40 -06:00
Erik Johnson
e2eaef1f44 1) Fixed syntax error affecting yaml code block. 2) A couple grammmar fixes. 3) Added section on return data for states 2012-01-29 19:48:45 -06:00
Erik Johnson
56ac9dec70 add link to state.highstate 2012-01-29 19:02:05 -06:00
Erik Johnson
a475787f41 Add warning about using dots in ID declaration 2012-01-29 18:51:57 -06:00
Seth House
a6bd7e0213 Improved the file.sed docstring by explaining how it verifies the state 2012-01-29 09:31:47 -07:00
Seth House
ea31382076 Revert "Allow file.sed to utilize regular expressions that are greedy" 
This reverts commit e640764e21.

This change would not attempt edits if the file contained other matching
occurrences of the "after" edit.
 2012-01-29 09:28:47 -07:00
Seth House
df4f240d46 Merge pull request #601 from fatbox/unittest2 
Support unittest2 under python < 2.7
 2012-01-29 08:00:34 -08:00
Evan Borgstrom
11cc43d22d Now that it's working let's make it a little nicer to use [GH-522] 
This allows for tests to be written without too much change from the
normal unittest workflow. Now they should use the 'saltunittest'
namespace and we will need to import anything we need from the original
'unittest' or 'unittest2' namespace.
 2012-01-29 10:17:51 -05:00
Evan Borgstrom
dde4198dae Allow tests to be run on python < 2.7 [GH-522] 
note: the host module test seems to be broken.
 2012-01-29 10:01:43 -05:00
Thomas S Hatch
e075c5853c keep the salt-call log level at info by default 2012-01-28 23:39:44 -07:00