Thomas S Hatch
2ca9819501
Merge pull request #4314 from jasonrm/fix-brew-list
...
Remove usage of now nonexistent args in brew module
2013-03-29 10:13:42 -07:00
Thomas S Hatch
bd724fd15c
Merge pull request #4313 from dlindquist/master
...
Fix missing id declaration is documentation
2013-03-29 10:10:56 -07:00
Thomas S Hatch
be6e3b5ee8
Merge pull request #4312 from basepi/pipe4296
...
Fix #4296 Catch errors from broken pipes
2013-03-29 10:04:36 -07:00
Thomas S Hatch
62008dd36c
Merge pull request #4310 from AccelerationNet/develop
...
Use posixpath sep everywhere
2013-03-29 10:03:45 -07:00
Colton Myers
a5ba5fef3a
Fix some PEP8 formatting issues
2013-03-29 10:05:30 -06:00
Matt Schartman
fe159e243c
Defaults to keeping old configuration, avoids hanging
2013-03-28 23:25:56 -07:00
Jason R. McNeil
99e07d8f0d
Remove usage of now nonexistent args in brew module
2013-03-28 21:18:36 -07:00
David Lindquist
29a234ff3e
Fix pkgrepo example
2013-03-28 17:36:27 -07:00
Colton Myers
bc4b415da6
Catch pipe errors
2013-03-28 18:03:30 -06:00
Colton Myers
b4dab551d0
Small PEP8 fix
2013-03-28 17:58:12 -06:00
Thomas S Hatch
47c004804c
Immport salt.master to get master exit exception
2013-03-28 17:35:14 -06:00
Thomas S Hatch
2100336a1b
Fix exception in fileclient
...
The data was refed before assignment, no need to delete this anyway
the named file would not exist in this case
2013-03-28 17:29:57 -06:00
Thomas S Hatch
e7178682cf
Pass in carbon_sock to repair assignment error
2013-03-28 17:21:15 -06:00
Thomas S Hatch
89309c08d8
Kill a stray tab
2013-03-28 17:16:03 -06:00
Thomas S Hatch
58802be20f
Fix bad ref to exc in ssh module
2013-03-28 17:14:13 -06:00
Thomas S Hatch
8cb4ff9625
Fix ref before assign errors in solr module
2013-03-28 16:15:40 -06:00
Nathan Bird
3c3c692c46
small optimization: Don't build string then immediately split to the same point.
2013-03-28 18:09:57 -04:00
Nathan Bird
5126c7a13f
BUG FIX: use '/' as the path separator to match salt master.
...
On windows os.path.sep won't match the path separator used in lists of
paths returned by the master.
Minor optimization: calculate the probe string once ahead of the loop,
not each time around.
2013-03-28 18:06:26 -04:00
Nathan Bird
aafe93aec4
HACKING: add backslash to indicate line continuation and make it copy/pasteable
2013-03-28 16:53:11 -04:00
Thomas S Hatch
de86ee6fa4
Merge pull request #4305 from ranl/develop
...
tomcat module fix
2013-03-28 12:16:25 -07:00
Ran Leibman
e95655bfcf
Merge remote-tracking branch 'upstream/develop' into develop
2013-03-28 21:01:22 +02:00
Ran Leibman
265c7efb7e
Merge remote-tracking branch 'upstream/develop' into develop
2013-03-28 20:58:42 +02:00
Thomas S Hatch
9671aca219
Fix blatant bug in salt.utils.option
2013-03-28 12:55:46 -06:00
Ran Leibman
e35bfcf140
use salt.util.option instead of pillar/config.option
2013-03-28 20:38:45 +02:00
Thomas S Hatch
8339af546d
Add option function to utils
2013-03-28 12:23:07 -06:00
Nico Mandery
4221ba8cbc
use postgresql CSV export to read data from the db. also adds psql_query command.
2013-03-28 17:15:37 +01:00
ran
9550be3963
- using pillar instead of config.option
...
- using version option in tomcat manager instead of ##
- remove war file from minion after copying
2013-03-28 11:11:06 +02:00
Grischa Meyer
10620cc406
removed runas for local network access
2013-03-28 15:20:57 +11:00
Thomas S Hatch
270bdc8ed2
Merge pull request #4303 from seanchannel/develop
...
make manpages on package build
2013-03-27 21:11:46 -07:00
David Boucha
fd90f534eb
Merge pull request #4304 from JustinCarmony/docs-watch-in-plug
...
Adding a reference to watch_in on the highstate reference
2013-03-27 20:49:25 -07:00
Justin Carmony
1a333692ac
Adding a reference to watch_in on the highstate reference
2013-03-27 21:44:57 -06:00
Sean Channel
7dc98c7152
make manpages on package build
2013-03-27 17:18:29 -07:00
Thomas S Hatch
c83dd01ebe
Add monitor list to disk state
2013-03-27 13:59:13 -06:00
Thomas S Hatch
59c7aa0b4f
Merge pull request #4300 from maspwr/develop
...
Fix pip requirements caching issue
2013-03-27 11:45:14 -07:00
Thomas S Hatch
a4dc80e37c
Merge pull request #4299 from jsdalton/fix_type_error_in_check_perms
...
Coerce output of file.get_mode to string
2013-03-27 11:43:03 -07:00
Mark Shirley
21efed310c
Fix pip requirements caching issue
2013-03-27 11:05:01 -07:00
Thomas S Hatch
e4656b5893
Fix #4286 by returning an empty string from get_mode
2013-03-27 11:49:37 -06:00
Jim Dalton
163e7f46f0
Coerce output of file.get_mode to string
2013-03-27 10:23:28 -07:00
Jeff Schroeder
d359c023c2
Fix a copy/paste bug that came from: 8dc0d012
2013-03-26 23:37:15 -05:00
Jeff Schroeder
285312adc3
Gracefully handle CTRL-c when running salt-key -D or -d
2013-03-26 23:28:30 -05:00
Thomas S Hatch
45ce9a22f1
reverse boolean on state determination
2013-03-26 22:08:04 -06:00
Thomas S Hatch
87f8c8263d
Add more error checks for state for retcode
2013-03-26 21:27:08 -06:00
Grischa Meyer
54f7055a38
renamed postgres.db to postgres.maintenance_db and all postgres module function arguments from db to maintenance_db
...
made default maintenance_db "postgres" and also made default postgres/psql runas local-server only
2013-03-27 11:03:56 +11:00
Thomas S Hatch
5a5db2843b
Add retcode evaluation to state functions
2013-03-26 17:06:46 -06:00
Thomas S Hatch
d48f57e797
Forgot to split the tag
2013-03-26 15:48:24 -06:00
Thomas S Hatch
970949e7a0
Only fire on result = False
2013-03-26 15:44:00 -06:00
Thomas S Hatch
cc2d0fe7f4
Fix set to be a list
2013-03-26 15:26:21 -06:00
Thomas S Hatch
d9700ea536
Refine ret load firing to handle individual firing for state components
2013-03-26 15:20:04 -06:00
Thomas S Hatch
9ba55fb942
Fire events when bad retcodes are returned
2013-03-26 14:23:34 -06:00
Thomas S Hatch
89d874b8f8
Add data on the return function to ret load
2013-03-26 14:17:44 -06:00
