Bret Palsson
c83e3be4fb
Add bridge yaml example for documentation
2012-07-31 00:14:03 -06:00
Bret Palsson
00d86c6032
Add bridge type
2012-07-30 21:58:11 -06:00
Bret Palsson
565122888d
Add bridge for RHEL{5,6} to jinja templates
2012-07-30 21:49:39 -06:00
Thomas S Hatch
75229d1463
Merge pull request #1729 from cheater/develop
...
Adding the gid_from_name parameter to the user.present state
2012-07-30 15:17:29 -07:00
cheater
d07d6b8a7b
Adding the gid_from_name parameter to the user.present state
2012-07-30 21:15:35 +02:00
Thomas S Hatch
880d6a99cd
Add more Joseph Hall
2012-07-30 08:45:15 -06:00
Thomas S Hatch
62b6ec2a32
Merge branch '0.10.2'
2012-07-30 08:39:10 -06:00
Seth House
84bdb294d4
Minor module/states rST syntax fixes
2012-07-30 00:53:21 -07:00
Seth House
01c654d8f1
Added missing modules/states/renderers docs to reference TOC
2012-07-30 00:53:21 -07:00
Seth House
542a255070
Removed duplicate TOC entry for standalone_minion
2012-07-30 00:44:01 -07:00
Thomas S Hatch
fb40b544dc
Merge pull request #1726 from bretep/feature/minion-hostname-change
...
Cleanup formatting in master.py
2012-07-29 23:34:14 -07:00
Bret Palsson
ca31f3e892
Simplify existing formatting
2012-07-29 23:54:27 -06:00
Bret Palsson
9e39331ff9
Fix sting formatting
2012-07-29 23:30:31 -06:00
Thomas S Hatch
0195b360a1
Merge pull request #1723 from avimar/git-order
...
Fix order for git checkout / git pull
2012-07-29 08:58:04 -07:00
Avi Marcus
08693a70e9
use whitespace
2012-07-29 17:32:32 +03:00
Avi Marcus
69ec588e96
do git pull before git checkout to ensure checking out new revisions
2012-07-29 17:22:33 +03:00
Thomas S Hatch
63d6e963c2
Take stdout redirection out of daemonization for #1096
2012-07-28 21:22:00 -06:00
Jeff Schroeder
ae5325febe
Merge pull request #1720 from mrud/mru/debian_doc
...
Update Debian installation documentation
2012-07-28 10:37:56 -07:00
Ulrich Dangel
52dbc5d406
Update Debian installation documentation
2012-07-28 19:31:27 +02:00
Thomas S Hatch
07e6c34ff1
Merge pull request #1718 from marcinkuzminski/develop
...
when using a single host string get_cli_event_returns get's a string
2012-07-28 08:08:35 -07:00
Thomas S Hatch
5596dac857
Merge pull request #1719 from bastichelaar/develop
...
Fix mongo_return, don't allow dots in key names
2012-07-28 08:02:14 -07:00
bastichelaar
35928991cf
Fix bug in mongo_return, made typo error
2012-07-28 15:18:54 +03:00
bastichelaar
7a3e3e63ad
Fix mongo_return, don't allow dots in key names
...
Recursively replace dots with dashes, MongoDB doesn't allow dots in key names.
2012-07-28 15:07:05 +03:00
Marcin Kuzminski
4985758ae4
when using a single host string get_cli_event_returns get's a string
...
and code expects this to be a set, and exception is throws.
This detects a string or list/tuple and coverts it to a set.
- also fixed verbose messages to be prettier
2012-07-28 13:12:17 +02:00
Thomas S Hatch
405cbc20d1
no other modules log this info. It should be excusively in the docs
2012-07-28 00:29:16 -06:00
Thomas S Hatch
8d38845b48
Merge pull request #1715 from f34rdotcom/develop
...
Fixes timeout issue after all messages received.
2012-07-27 21:36:09 -07:00
sean mathews
1936f31e26
Fixes timeout issue after all messages received.
2012-07-27 21:20:49 -07:00
Thomas S Hatch
c25259424b
generate fresh manpages for 0.10.2
2012-07-27 18:04:56 -06:00
Thomas S Hatch
e52065b516
Bump the version to 0.10.2
2012-07-27 18:01:03 -06:00
Thomas S Hatch
beb9e62c0d
Make the wait time really seconds for the event system
2012-07-27 17:58:59 -06:00
Thomas S Hatch
cf6518efbd
Fix #1675
2012-07-27 17:03:01 -06:00
Thomas S Hatch
2393985997
Add a method to populate the default opts for a key object
...
This is the Fix for #1696 - instead of manually setting all of the
options one can now call the key._cli_opts method to populate them
2012-07-27 15:01:15 -06:00
Thomas S Hatch
dc82d7f007
Fix help message for key logfile
2012-07-27 14:58:19 -06:00
Thomas S Hatch
9de83faa49
change default key logfile
...
none of the other log files salt uses end in .log
2012-07-27 14:57:26 -06:00
Thomas S Hatch
cff0e7e776
Wrap no sub_timeout in tune_in
2012-07-27 14:45:29 -06:00
Thomas S Hatch
cc06749a3c
fix doc for runner command
2012-07-27 14:13:55 -06:00
Thomas S Hatch
c2f583c9fc
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-07-27 14:13:23 -06:00
Thomas S Hatch
40725496a4
Wrap tune_in with different try/except
2012-07-27 14:12:45 -06:00
Thomas S Hatch
012e436dd4
Merge pull request #1712 from marcinkuzminski/develop
...
fixed salt runner doc typo
2012-07-27 12:24:51 -07:00
Marcin Kuzminski
24223e57ae
fixed salt runner doc typo
2012-07-27 21:19:36 +02:00
Thomas S Hatch
f437242f66
Merge pull request #1711 from marcinkuzminski/develop
...
Added logging into JSON outputter so it does not silently hide errors
2012-07-27 11:55:06 -07:00
Marcin Kuzminski
a70f8c8e07
Added logging into JSON outputter so it does not silently hide errors
2012-07-27 20:49:24 +02:00
Thomas S Hatch
3a789723d1
Merge pull request #1710 from mrud/mru/typo
...
Fix missing ` in release notes
2012-07-27 11:48:35 -07:00
Ulrich Dangel
55d3e4745c
Fix missing ` in release notes
2012-07-27 20:39:49 +02:00
Thomas S Hatch
3de63c3972
Merge pull request #1709 from mrud/mru/doc_autosigning
...
Mention autosigning
2012-07-27 11:33:46 -07:00
Ulrich Dangel
be01b54a92
Mention autosigning
2012-07-27 20:31:23 +02:00
Thomas S Hatch
8d8130b064
Add key verification addition
2012-07-27 12:13:56 -06:00
Thomas S Hatch
487432f566
Merge pull request #1708 from mrud/mru/release_notes
...
Mru/release notes
2012-07-27 10:20:22 -07:00
Ulrich Dangel
7b72594935
Add information about new/improved modules
2012-07-27 19:15:21 +02:00
Ulrich Dangel
b017fe4e9f
Add note about new configuration file handling.
2012-07-27 19:14:26 +02:00
