Commit Graph

2840 Commits

Author SHA1 Message Date
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
Thomas S Hatch
392179ef86 Merge pull request #600 from SEJeff/puppet-module-features
Puppet module features
2012-01-28 22:39:23 -08:00
Thomas S Hatch
75e5a407af Add jid_to_time to utils 2012-01-28 23:28:04 -07:00
Thomas S Hatch
686a051a5c Add list_jobs to jobs runner 2012-01-28 23:25:37 -07:00
Thomas S Hatch
c979b04c14 minor fix to jid lookup 2012-01-28 22:10:38 -07:00
Jeff Schroeder
1ac1c9a51a Change the default CLI loglevel to warn 2012-01-28 21:09:45 -08:00
Jeff Schroeder
7c8624399e Add facter support to puppet module 2012-01-28 21:09:45 -08:00
Thomas S Hatch
617ad70830 add runners.jobs.lookup_jid 2012-01-28 22:07:49 -07:00
Thomas S Hatch
80f4b753ca some visual refinements to jobs.active 2012-01-28 20:29:07 -07:00
Thomas S Hatch
8de2b56df2 Add jobs runner 2012-01-28 19:58:03 -07:00
Thomas S Hatch
703f2b4dc6 Fix issue when no space after device in netdev 2012-01-27 21:01:11 -07:00
Thomas S Hatch
e42561b5cf set authorized_keys file to 0600 when it is made with Salt 2012-01-27 20:47:08 -07:00
Thomas S Hatch
7dfe4b4312 make new .ssh dirs and authorized keys files have the right perms 2012-01-27 20:41:32 -07:00
Thomas S Hatch
796db58588 change to a warning log 2012-01-27 15:06:51 -07:00
Thomas S Hatch
90a74c33a3 fix syntax issue and formatting for mysql_grants state
We may want to consider merging these mysql states into 1
2012-01-27 14:02:24 -07:00
Thomas S Hatch
96e0c64210 Catch anything that does not come up as an import error 2012-01-27 13:58:23 -07:00
Thomas S Hatch
bfcbb066f1 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-01-27 13:50:53 -07:00
Thomas S Hatch
4e90f2b245 only verify the structure formatting on requisites 2012-01-27 13:50:07 -07:00
Seth House
1f0dd9d19a Added explicit check for both version and avail version in pkg.latest 2012-01-27 13:47:02 -07:00
Thomas S Hatch
8d5fc75d27 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-01-27 13:43:58 -07:00
Thomas S Hatch
fb445f86cc add checks for absolute paths 2012-01-27 13:40:13 -07:00
Seth House
ba7ddb0c04 Change available_version() on el5 to only output upgrades
This was failing because ``yum list`` outputs installed versions before
newer versions.

Fixes #569.
2012-01-27 13:23:02 -07:00
Seth House
ad5216963f Removed unnecessary repo from the PPA install instructions
The zmq packages are now hosted in our own repository.
2012-01-27 13:22:24 -07:00
Seth House
434a8a96aa Updated favicon with new logo 2012-01-27 13:21:58 -07:00
Thomas S Hatch
45ba82b132 Merge pull request #591 from syphernl/develop
Implement support for granting/revoking mysql permissions.
2012-01-27 10:55:11 -08:00
Frank Klaassen
e99b5f81bb Implement support for granting/revoking mysql permissions. 2012-01-27 19:38:04 +01:00
Thomas S Hatch
654692830f Merge pull request #589 from epoelke/develop
add --quiet and --outfile options to saltkey
2012-01-27 08:56:43 -08:00