Seth House
32c944c1e9
Changed syntax highlighting from ini to yaml since conf files are yaml
2013-01-11 14:27:09 -07:00
Seth House
f7663df9b6
Fixed paths to the master/minion conf files
2013-01-11 14:26:28 -07:00
Seth House
99722dc6b9
Removed calls to a non-existent role
2013-01-11 14:17:52 -07:00
Thomas S Hatch
9bd48bb3fa
Merge pull request #3240 from MTecknology/develop
...
Learning python.. .get() doesn't work on a list.
2013-01-11 12:54:39 -08:00
Michael Lustfield
5c26bd13af
typo
2013-01-11 14:55:44 -06:00
Thomas S Hatch
8f80ec7064
Merge pull request #3239 from torhve/develop
...
A doc fix and change default outputter in salt-call
2013-01-11 12:52:25 -08:00
Michael Lustfield
f44ac5ac55
Learning python.. .get() doesn't work on a list.
2013-01-11 14:45:07 -06:00
Tor Hveem
6a87bcf5d2
Change the default outputter in salt-call to be nested
2013-01-11 21:36:11 +01:00
Tor Hveem
c3f93136ef
Fix docstrings for the outputters
2013-01-11 21:29:55 +01:00
David Boucha
43f9466aa3
Merge pull request #3237 from s0undt3ch/issues/3214
...
Adapt to the new local client events changes. Fixes #3214 .
2013-01-11 12:24:01 -08:00
Thomas S Hatch
01078aed4e
Fix issue when extensions are not installed with jinja2
2013-01-11 12:58:44 -07:00
Thomas S Hatch
d11f07b4b4
Fix saltstack/salt-bootstrap#10
2013-01-11 12:51:39 -07:00
David Boucha
1252399038
Merge pull request #3236 from MTecknology/develop
...
Undoing unintentional change with callable
2013-01-11 11:10:34 -08:00
Michael Lustfield
88c0eeba55
typo..
2013-01-11 13:05:50 -06:00
Pedro Algarvio
fd2739401c
Adapt to the new local client events changes. Fixes #3214 .
2013-01-11 19:03:53 +00:00
Michael Lustfield
ae337b3f3c
Undoing unintentional change with callable
2013-01-11 13:02:35 -06:00
Thomas S Hatch
83be253b41
Merge pull request #3228 from shadowfax-chc/makeconf-del
...
Makeconf del
2013-01-11 08:59:26 -08:00
Thomas S Hatch
5b057bbfdf
Merge pull request #3230 from torhve/develop
...
Bugfix import of yaml. Add CLI example to docstring. Return the value.
2013-01-11 08:58:21 -08:00
David Boucha
7d4cc5b5dd
Merge pull request #3233 from s0undt3ch/develop
...
Improve `salt.modules.debconfmod` + PEP8.
2013-01-11 08:47:50 -08:00
Thomas S Hatch
d623e6df98
Merge pull request #3232 from s0undt3ch/issues/3214
...
The test suite local client now properly receives the events. Fixes #3214 .
2013-01-11 08:33:41 -08:00
Pedro Algarvio
39f03c59cd
The test suite local client now properly receives the events. Fixes #3214 .
...
* We were instantiating the integration testing local client too soon in the process. Deferring it to a little latter made it all work.
* Added the ability to dump the master and minion testing configurations to files. Just prepend the `runtests` call with `DUMP_SALT_CONFIG=1` and you'll get the computed configuration files in `/tmp/salttest/{master,minion}`.
* We now also un-subscribe from the event's once done.
* Added `salt.utils.event.LocalClientEvent` just to differentiate from `salt.utils.event.MasterEvent` in the logs so we know who's who. It's just a subclass of the latter.
2013-01-11 16:21:04 +00:00
Pedro Algarvio
78816ee40d
Improve salt.modules.debconfmod + PEP8.
...
A missing package is a warning not a error on since salt will run perfectly fine without that package. The module depends on that package but salt does not.
2013-01-11 16:13:27 +00:00
David Boucha
cfe32f5826
Merge pull request #3231 from kjkuan/bugfix-cli-loglevel
...
Fix a bug of getting an incorrect active log level.
2013-01-11 08:07:47 -08:00
Jack Kuan
11b583ba84
Fix a bug of getting an incorrect active log level.
2013-01-11 11:00:50 -05:00
Tor Hveem
22241269e0
Bugfix import of yaml. Add CLI example to docstring. Return the value.
2013-01-11 14:35:07 +01:00
shadowfax-chc
97ce81d393
Added absent state to makeconf state
2013-01-11 03:11:09 -05:00
shadowfax-chc
b062583254
Added function to makeconf module to remove a var
...
Allows for completely removing a variable from the make.conf file
2013-01-11 02:59:07 -05:00
Sean Channel
8148c92190
too many exit codes
2013-01-10 22:49:57 -08:00
Thomas S Hatch
10b110406f
Catch fs update exceptions and carry on with a log message
2013-01-10 20:15:20 -07:00
Thomas S Hatch
409221037c
Add color optiuon to default minion config
2013-01-10 18:16:24 -07:00
Thomas S Hatch
4e0f2f2110
Add color value to the default config
2013-01-10 18:15:05 -07:00
Thomas S Hatch
3c119f48da
Add output tot he default minion config
2013-01-10 18:13:31 -07:00
Thomas S Hatch
eb582dee60
Add output option to default master config
2013-01-10 18:12:11 -07:00
Thomas S Hatch
b41562ef6b
Merge pull request #3227 from seanchannel/develop
...
wordsmith logging options
2013-01-10 17:06:47 -08:00
Sean Channel
c363fbe690
localhost -> loghost
2013-01-10 16:59:24 -08:00
Sean Channel
6b35ca83d0
wordsmith logging options
2013-01-10 16:51:44 -08:00
Thomas S Hatch
5863e9bead
Merge pull request #3226 from UtahDave/doc_developer_info
...
Add first draft of developer docs.
2013-01-10 16:09:03 -08:00
David Boucha
41f53e12d6
Add first draft of developer docs.
...
Add directory for future developer docs.
Add first doc on the "dunder dictionaries" on the "__context__" dict
2013-01-10 15:38:26 -07:00
Thomas S Hatch
e4bc196478
Merge pull request #3223 from MTecknology/develop
...
Changed modules to keep from making excessive and redundant calls...
2013-01-10 13:16:58 -08:00
Thomas S Hatch
8f3886e67b
Merge pull request #3221 from havan/fix-sysdoc
...
Fix issue #3219
2013-01-10 13:03:50 -08:00
Joseph Hall
6a8e1f05a4
Merge pull request #3225 from shadowfax-chc/layman
...
Fixex typo in layman module
2013-01-10 13:03:25 -08:00
shadowfax-chc
14e7df235f
Fixex typo in layman module
2013-01-10 20:54:47 +00:00
David Boucha
91da0277d8
Merge pull request #3224 from patrickw-nf/patch-1
...
ipc_mode: tcp
2013-01-10 12:41:39 -08:00
patrickw-nf
2dcefe948f
ipc_mode: tcp
...
Related to: https://github.com/saltstack/salt/issues/1882
2013-01-10 12:36:51 -08:00
Michael Lustfield
6393269fad
Making the gecos stuff easier to read
2013-01-10 14:21:28 -06:00
Michael Lustfield
1c3c891013
minor whitespace change
2013-01-10 14:16:18 -06:00
Michael Lustfield
fbe2035a7e
Done fixing the adduser and addgroup performance issues
2013-01-10 13:56:13 -06:00
Michael Lustfield
e7986c5d32
More work on fixing performance issues
2013-01-10 13:05:15 -06:00
Thomas S Hatch
eacd67e902
Merge pull request #3220 from fsniper/develop
...
issue 3218 virtualenv.managed state ignores the salt file environment wh...
2013-01-10 10:37:51 -08:00
Ekrem Seren
7806efdea3
Fix issue #3219
2013-01-10 20:28:24 +02:00
