Seth House
6db5a8f94b
Added / updated module docs
2012-10-25 14:36:02 -06:00
Seth House
f48a0d9da5
Mocked rabbitmq_server
2012-10-25 14:36:02 -06:00
Thomas S Hatch
62c92524fb
Merge pull request #2354 from seanchannel/develop
...
cleanup ubuntu install
2012-10-25 13:07:26 -07:00
Sean Channel
df550e83dc
may as well do it here too
2012-10-25 12:29:10 -07:00
Sean Channel
671665eb24
separate actuall install commands
2012-10-25 12:27:12 -07:00
Sean Channel
c280d67945
cleanup ubuntu install
2012-10-25 12:09:07 -07:00
Joseph Hall
b73b44518d
Merge pull request #2350 from gcw/develop
...
another minor typo correction
2012-10-25 10:31:51 -07:00
G. Clifford Williams
5886991459
another minor typo correction
2012-10-25 12:26:52 -05:00
Thomas S Hatch
fd75bd3f38
Add a restorecon if the bin is available when moving files into place
2012-10-25 11:26:15 -06:00
Thomas S Hatch
259dbb85fb
Merge pull request #2349 from gcw/develop
...
minor typo correction
2012-10-25 10:22:11 -07:00
G. Clifford Williams
6b0ea10b7e
minor typo correction
2012-10-25 12:19:35 -05:00
Thomas S Hatch
a3351e6187
Add strip_clean function to highstate outputter
2012-10-25 10:48:15 -06:00
Thomas S Hatch
f05677681f
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-10-25 10:19:58 -06:00
Thomas S Hatch
4a159aed79
Add pprint import
2012-10-25 10:19:09 -06:00
Thomas S Hatch
87d155e944
fix translation of the test output system
2012-10-24 23:08:57 -06:00
Thomas S Hatch
1fa5129b90
Fix tests wrt output updates
2012-10-24 22:55:18 -06:00
Thomas S Hatch
eab3602e37
Bypass issue with None types in outputters
2012-10-24 22:54:47 -06:00
Thomas S Hatch
b0d2e54538
handle None passed into outputter
2012-10-24 21:55:08 -06:00
Thomas S Hatch
0c60434dc5
Handle output passthrou from the cli
2012-10-24 21:27:05 -06:00
Thomas S Hatch
df5050eaaf
Gather everything under the tests
2012-10-24 20:59:33 -06:00
Thomas S Hatch
838b78c68d
Always return a valid function
2012-10-24 19:36:35 -06:00
Thomas S Hatch
fce156a324
Merge pull request #2346 from anttix/recurse
...
Use file.managed as a backend of file.recurse. Fixes #1583
2012-10-24 17:27:45 -07:00
Thomas S Hatch
ba3b611e0b
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-10-24 18:21:09 -06:00
Thomas S Hatch
9afa5b8b2f
Fix issue where interfaces pass in _out
2012-10-24 18:20:46 -06:00
Antti Andreimann
7085edf590
Use file.managed as a backend of file.recurse. Fixes #1583
...
Rewrite file.recurse state module to leverage existing file.managed and file.directory
modules to do the heavy lifting. This removes code duplication and will make
templates available for file.recurse.
These improvements will be visible to the end-user:
- All files in directory can now be templatized
- destination directory is no longer created in test mode
- When clean mode is enabled, the module is capable of replacing
existing files with directories and vice versa
2012-10-24 17:15:29 -07:00
Seth House
009930cc66
Restore __version_info__
2012-10-24 18:10:12 -06:00
Thomas S Hatch
534bbb0488
Merge pull request #2345 from whiteinge/salt-versiongit
...
Use Git revision information for __version__ if possible
2012-10-24 17:01:10 -07:00
Seth House
16ada5a96a
Use Git revision information for __version__ if possible
...
Fixes #701
2012-10-24 17:49:33 -06:00
Thomas S Hatch
6dbe1057d2
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-10-24 17:14:16 -06:00
Thomas S Hatch
0fc1ed503c
remove old output module in fafor of new modular output system
2012-10-24 17:09:27 -06:00
Thomas S Hatch
df5d06279b
cleanly pass color flags into outputters
2012-10-24 17:08:57 -06:00
Thomas S Hatch
20fd255d85
return none when no outputter specified
2012-10-24 16:40:11 -06:00
Thomas S Hatch
57b88165ad
Add output package to setup.py
2012-10-24 16:26:48 -06:00
Thomas S Hatch
6ef80f7603
Change salt-call to use the new outputter systems
2012-10-24 16:18:26 -06:00
Thomas S Hatch
c423156be6
get_printout api fix
2012-10-24 16:13:58 -06:00
Thomas S Hatch
cbd7b9c1d7
iFix some spacing in the outputter
2012-10-24 16:11:27 -06:00
Thomas S Hatch
b5d8b3e25c
Add get_printout
2012-10-24 16:10:31 -06:00
Thomas S Hatch
db1e13e294
Add yaml outputter
2012-10-24 15:52:20 -06:00
Thomas S Hatch
09f42ea465
Add txt outputter
2012-10-24 15:51:58 -06:00
Thomas S Hatch
35a683738f
Add raw outputter
2012-10-24 15:51:14 -06:00
Thomas S Hatch
ba5cd5cfe4
Add json outputter
2012-10-24 15:48:12 -06:00
Thomas S Hatch
4b69ed07fd
Add highstate outputter
2012-10-24 15:47:39 -06:00
Thomas S Hatch
d27b2d71a0
Add some checks to output module
2012-10-24 14:37:05 -06:00
Thomas S Hatch
ed94e99fe1
Merge pull request #2344 from whiteinge/saltapi-miscfixes
...
Misc changes fixes from work on salt-api
2012-10-24 11:51:28 -07:00
Thomas S Hatch
da46c236b3
Add outputter function to loader
2012-10-24 12:46:17 -06:00
Thomas S Hatch
90f234578a
Add modular output directory
2012-10-24 12:45:57 -06:00
Thomas S Hatch
0fa1442240
Merge pull request #2341 from ydavid365/develop
...
updated readme file for typos and clarity
2012-10-24 11:34:44 -07:00
John Albietz
0055b69404
updated readme file for typos and clarity
...
fixed a few typos, but mainly altering the parallel execution paragraph.
Granular controls are possibly a clearer way to frame the parallel execution discussion.
In production, the parallel execution is less important than the flexibility to use
batch groups and powerful filtering.
2012-10-24 11:25:23 -07:00
Thomas S Hatch
9d24d8887e
Merge pull request #2340 from herlo/develop
...
Updating spec to 0.10.4, patching bug #2335 (RHBZ#869669)
2012-10-24 11:12:30 -07:00
Clint Savage
48fe835c16
Updating spec to 0.10.4, patching bug #2335 (RHBZ#869669)
2012-10-24 12:08:28 -06:00
