Thomas S Hatch
e0cb9ae044
Merge pull request #2093 from bendavis78/develop
...
Fixed support for YAML "<<" merge operator
2012-09-25 16:24:11 -07:00
Ben Davis
1d2bb3f8c7
Fixed support for YAML "<<" merge operator
2012-09-25 18:24:14 -05:00
Pedro Algarvio
43e25c6696
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-09-25 22:34:36 +01:00
Pedro Algarvio
ec2486c9d8
Only test supervisor if conditions are proper. Refs #2026 .
...
* Only the root user can run the supervisor state tests.
* Install supervisor on the travis-ci machine to run the tests.
2012-09-25 22:32:42 +01:00
Seth House
9ef240cdf5
Merge pull request #2091 from UtahDave/develop
...
salt-key -F was returning pub key sig for priv key
2012-09-25 14:20:58 -07:00
Pedro Algarvio
d2aae8d91c
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-09-25 22:19:43 +01:00
Pedro Algarvio
6e5fd9e62c
Regular users cannot run the supervisor tests.
2012-09-25 22:19:28 +01:00
Pedro Algarvio
f0fb739477
Merge branch 'develop' of github.com:saltstack/salt into issues/2087
2012-09-25 22:17:11 +01:00
Pedro Algarvio
0b48e08c36
Regular users cannot run the supervisor tests.
2012-09-25 22:15:38 +01:00
Dave Boucha
9bd6584019
salt-key -F was returning pub key sig for priv key
...
salt-key -F was returning the public key signature
for both the public and private keys.
fixes #2090
2012-09-25 15:08:01 -06:00
Thomas S Hatch
59632f8506
Merge pull request #2089 from rubic/develop
...
update salt-key man page
2012-09-25 12:35:00 -07:00
Pedro Algarvio
4a065f7e0d
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-09-25 20:32:13 +01:00
Jeff Bauer
8daf10e373
update salt-key man page
2012-09-25 14:31:16 -05:00
Thomas S Hatch
4747682bf0
Merge pull request #2088 from DarkSinclair/develop
...
Fixing operand mismatch between dict and string in file.recurse ...
2012-09-25 10:22:35 -07:00
Thomas S Hatch
a5d28de106
Merge pull request #2086 from cul/develop
...
Events documentation fix - iter_event*s*
2012-09-25 10:21:27 -07:00
Thomas S Hatch
43382b6d1c
Merge pull request #2085 from s0undt3ch/issues/2028
...
Address `pip.installed` regarding weird packages setup. Fixes #2028 .
2012-09-25 10:20:47 -07:00
Ian Sinclair
49b1e288da
Fixing operand mismatch between dict and string in file.recurse for return comment when a File is cleaned from a directory on recurse
2012-09-25 10:48:33 -04:00
Thomas Kula
6024649f5a
Events documentation fix - iter_event*s*
...
It's 'iter_events', not 'iter_event'
2012-09-25 10:22:26 -04:00
Pedro Algarvio
41f0f4449e
Address pip.installed regarding weird packages setup. Fixes #2028 .
...
Some packages, carbon and graphite-web for example, install their packages to a specific root, using a `virtualenv` or not. `pip freeze` won't show those packages as installed.
2012-09-25 12:24:54 +01:00
Thomas S Hatch
bc26e8c5eb
Merge pull request #2084 from gcw/develop
...
corrected error in error message for json renderers (jinja and wempy onl...
2012-09-24 21:30:47 -07:00
Thomas S Hatch
52416bf0bd
Some minor changes to the minion conf template
2012-09-24 22:29:20 -06:00
G. Clifford Williams
ba8bd11072
corrected error in error message for json renderers (jinja and wempy only)
2012-09-24 23:21:58 -05:00
Thomas S Hatch
e76914c176
extention modules is internal, my bad
2012-09-24 21:16:50 -06:00
Thomas S Hatch
2c8b030c8a
Merge pull request #2083 from romeotheriault/add-solaris-service-smf-module
...
add smf module to support virtual service module on solaris 10+
2012-09-24 19:49:30 -07:00
Romeo Theriault
ae5407acd1
add smf module to support virtual service module on solaris 10+
2012-09-24 14:57:42 -10:00
Seth House
f9efcffbf4
Missed the hidden 'v' in last commit
2012-09-24 12:20:17 -07:00
Seth House
b1ecedfc28
Point links to Github blobs to 'develop' instead of releases
2012-09-24 12:16:12 -07:00
Thomas S Hatch
b80b7cc395
Clean up master config template a little
...
I got rid of the cluster stuff, since it does not work and needs
to be pulled out of the core anyway
2012-09-24 11:43:33 -06:00
Scott Walton
438ea792a7
Added state and test for stopping services #2026
2012-09-24 09:45:31 +01:00
Thomas S Hatch
f0145f74ea
clean up unused vars
2012-09-24 01:07:13 -06:00
Thomas S Hatch
50857861c5
remove unused import
2012-09-24 01:03:24 -06:00
Thomas S Hatch
966632e8a1
Clean out unused pathsep var
2012-09-24 01:02:21 -06:00
Thomas S Hatch
41a0ef17a6
Fix uninitiated value split
2012-09-24 01:01:04 -06:00
Thomas S Hatch
f905802faf
remove unused var
2012-09-24 00:56:13 -06:00
Thomas S Hatch
aebc1b6e2b
more unused imports
2012-09-24 00:55:31 -06:00
Thomas S Hatch
282c8f4e3c
clean out unused imports
2012-09-24 00:55:01 -06:00
Thomas S Hatch
0c0615546d
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-09-24 00:53:25 -06:00
Thomas S Hatch
bbc6252bd3
Make the ca module code clean and consistent
2012-09-24 00:52:52 -06:00
Thomas S Hatch
80aba3e7a9
Merge pull request #2082 from seanchannel/patch-10
...
extension_modules added in root_dir comments
2012-09-23 23:44:26 -07:00
Sean Channel
e90c3d36a4
extension_modules added in root_dir comments
...
I still don't know what it's for, but I know where it goes! :)
2012-09-23 23:38:25 -07:00
Thomas S Hatch
2a135dd1d1
pylint fixes for ca modules
2012-09-24 00:18:56 -06:00
Thomas S Hatch
16ce0332a1
Merge pull request #2080 from seanchannel/develop
...
add tcp_pub_port, tcp_pull_port
2012-09-23 22:58:25 -07:00
Thomas S Hatch
cf1e87e185
Merge pull request #2031 from scott-w/develop
...
Add Supervisor Support
2012-09-23 22:56:45 -07:00
Sean Channel
9b6ddb4494
Merge branch 'develop' of github.com:/seanchannel/salt into develop
2012-09-23 22:56:00 -07:00
Sean Channel
9fbd83752a
tcp_pub_port, tcp_pull_port
2012-09-23 22:55:28 -07:00
Thomas S Hatch
5d43b8b852
Merge pull request #2079 from seanchannel/develop
...
11 missing parameters added to minion template
2012-09-23 22:51:20 -07:00
Sean Channel
ce3e6f1189
pidfile correction: minion -> master
...
I don't see the minion actually using this parameter. I don't see a pidfile anywhere.
2012-09-23 22:50:38 -07:00
Sean Channel
b6b1dac3e1
added:
...
sock_dir
verify_env
extension_modules
master_finger
failhard
startup_states
sls_list
top_file
ipc_mode
grains
timeout
2012-09-23 22:40:33 -07:00
Sean Channel
6e9a7905ba
missing a space over pidfile
2012-09-23 22:33:49 -07:00
Thomas S Hatch
2ebb93e2d8
Fix #2078
2012-09-23 23:31:18 -06:00
