Commit Graph

2002 Commits

Author SHA1 Message Date
Jeff Schroeder
61773bdaf9 Fix a bug in ssh.host_keys 2011-12-13 23:05:54 -08:00
Thomas S Hatch
a07fd0577c Merge branch 'develop' of github.com:saltstack/salt into develop 2011-12-13 22:13:02 -07:00
Thomas S Hatch
251c238e7d Merge branch 'msgpack' into develop 2011-12-13 22:12:34 -07:00
Thomas S Hatch
667f4163f9 Add saftey to prevent master workers from dying with old minions 2011-12-13 22:05:16 -07:00
Thomas S Hatch
702bc3f6b0 update more package refs 2011-12-13 21:41:49 -07:00
Thomas S Hatch
44b53fa130 Fix references to old package unpackage 2011-12-13 21:36:25 -07:00
Thomas S Hatch
16bb1d8f3a Add some self 2011-12-13 21:32:52 -07:00
Thomas S Hatch
8b025bb661 forgot to quote 2011-12-13 21:26:20 -07:00
Thomas S Hatch
a411447739 fix crypticale opts ordering 2011-12-13 21:24:21 -07:00
Thomas S Hatch
b79e0017c4 Transform serialization systems to use the serial class 2011-12-13 21:15:56 -07:00
Thomas S Hatch
fd4d47ed6b change serialization to use a class 2011-12-13 20:20:34 -07:00
Thomas S Hatch
2ac459fb51 Merge pull request #354 from SEJeff/misc-cleanups
Misc cleanups
2011-12-13 08:37:19 -08:00
Jeff Schroeder
e7db6d4a3e Allow module specific __init__()
Closes #138
2011-12-12 22:10:04 -08:00
Jeff Schroeder
2829ae5e41 Fix a typo in the master log for accepting salt keys 2011-12-12 21:57:52 -08:00
Thomas S Hatch
0e8cfcf5c3 Merge pull request #350 from whiteinge/salt-sed
Add sed, comment, uncomment, contains, append functions & states
2011-12-12 15:34:59 -08:00
Thomas S Hatch
d226568630 Merge pull request #351 from whiteinge/doc-freenode
Updated IRC references from OFTC to Freenode
2011-12-12 15:34:20 -08:00
Seth House
badb3dff12 Updated IRC references from OFTC to Freenode 2011-12-12 13:53:36 -07:00
Seth House
d369d7f4ce Add sed, comment, uncomment, contains, append functions & states 2011-12-12 10:49:36 -07:00
Thomas S Hatch
16ae723fcd Merge pull request #348 from whiteinge/doc-el5install
Fixed el5 and Lucid instructions
2011-12-12 09:18:32 -08:00
Seth House
a9a0f58698 Simplified the Lucid instructions
I don't yet know how to get the PPA also building for Maverick, so may
as well simplify the instructions for now.
2011-12-12 01:54:56 -07:00
Seth House
b08b0f98f5 Added el5/el6 install instructions; unified all the rpm instructions 2011-12-12 01:51:36 -07:00
Thomas S Hatch
677d65d0aa Add dump and load to salt.payload 2011-12-11 23:28:06 -07:00
Thomas S Hatch
e7c22158ad update to use the payload module 2011-12-11 23:07:08 -07:00
Thomas S Hatch
f6bf4f4de9 Add dumps and loads functions to payload.py 2011-12-11 22:38:39 -07:00
Thomas S Hatch
178f06e694 Merge pull request #346 from SEJeff/misc-cleanups
Add utils.which() and clean up some _virtual() logic
2011-12-10 23:27:59 -08:00
Jeff Schroeder
8f55f3591b Allow calling which() without an argument 2011-12-10 23:28:58 -08:00
Jeff Schroeder
16eeaa63df Merge branch 'develop' of https://github.com/saltstack/salt into misc-cleanups
Conflicts:
	salt/utils/__init__.py

Fix the merge conflicts by adding utils.which() before utils.list_files()
2011-12-10 23:23:25 -08:00
Jeff Schroeder
3e3fc17a70 Don't call salt.utils.which() from salt.loader.Loader.get_grains()
Otherwise it will traceback
2011-12-10 23:15:47 -08:00
Jeff Schroeder
98f977b365 Fix an improper import 2011-12-10 23:01:38 -08:00
Thomas S Hatch
012fd23ccf purge the last of the pickling 2011-12-10 15:16:34 -07:00
Thomas S Hatch
1d3a924fb3 Add comment explaining try/except block 2011-12-10 14:52:35 -07:00
Thomas S Hatch
f00237a8e2 fix a version issue 2011-12-10 14:47:06 -07:00
Thomas S Hatch
8b0bd99360 more modifications to fic cython builds 2011-12-10 14:45:43 -07:00
Thomas S Hatch
57d9bb8feb ref the right version mod 2011-12-10 14:34:42 -07:00
Thomas S Hatch
fb42253e7e fix version loading issue with cython 2011-12-10 14:33:57 -07:00
Thomas S Hatch
69733eb42b change all pickles to msgpack 2011-12-10 14:15:28 -07:00
Thomas S Hatch
1b69f10bc8 fix import issue in built in msgpack 2011-12-10 13:35:01 -07:00
Thomas S Hatch
0d666254d9 Add msgpack to the main application 2011-12-10 13:12:16 -07:00
Thomas S Hatch
a7a136fd8d Add starting states doc 2011-12-10 00:28:29 -07:00
Thomas S Hatch
3a32864e9a Add state_verbose: False option to make states less chatty 2011-12-10 00:15:57 -07:00
Thomas S Hatch
4bc863fd3f Add directory cleaning to file.directory and file.recurse 2011-12-09 23:53:54 -07:00
Thomas S Hatch
0fbeb784a3 Add list_files to the utils module 2011-12-09 23:05:32 -07:00
Thomas S Hatch
d671b48cf8 Merge branch 'develop' of github.com:saltstack/salt into develop 2011-12-09 18:42:19 -07:00
Thomas S Hatch
63639d8668 Add outputter support to salt -Q (making is useful) 2011-12-09 18:37:50 -07:00
Thomas S Hatch
b09066587c clean up JSON sillyness 2011-12-09 17:55:29 -07:00
Thomas S Hatch
2867a331ee Merge pull request #342 from epoelke/develop
slave_lag now works actually works.
2011-12-09 16:37:46 -08:00
epoelke@gmail.com
4de57eff30 minor code clean up. 2011-12-09 14:19:15 -08:00
epoelke@gmail.com
c3a42a1d66 mysql.slave_lag now works, returns -1 when system is not a slave or number of seconds behind master when system is a slave. 2011-12-09 09:25:09 -08:00
Thomas S Hatch
2efee26644 Merge pull request #337 from jglazner/develop
merged/fixed solr docs, and shortened a variable name
2011-12-08 11:23:54 -08:00
Jed Glazner
28fa4ff4ae merged/fixed solr docs, and shortened a variable name 2011-12-08 18:38:28 +00:00