Thomas S Hatch
f84ded5301
Add chnages to generating the pillar for extra seurity
2012-10-14 15:35:55 -06:00
Thomas S Hatch
fc67a2d43a
Add pillar_version option
2012-10-14 15:33:52 -06:00
Thomas S Hatch
5edcc38430
Merge pull request #2243 from teftin/fix-amazon-os-grains
...
recognize Amazon Linux properly
2012-10-14 12:26:42 -07:00
Ecto
621c69110a
recognize Amazon Linux properly
2012-10-14 20:17:02 +01:00
Thomas S Hatch
dd348dfa79
Fix padding calls in crypt
2012-10-13 22:32:45 -06:00
Thomas S Hatch
c6558df5fd
Add padding format for m2crypto
2012-10-13 22:29:27 -06:00
Thomas S Hatch
17481e1908
Deal with minion token on the master side
2012-10-13 21:50:43 -06:00
Thomas S Hatch
89480246f8
Make the minion pass an encrypted random string
...
This is used to verify the handshake
2012-10-13 21:34:38 -06:00
Thomas S Hatch
5b0d47782c
Merge pull request #2238 from romeotheriault/develop
...
solaris shadow module
2012-10-12 20:58:01 -07:00
Romeo Theriault
fee6b6bd0a
solaris shadow module
2012-10-12 17:39:23 -10:00
David Boucha
df0abdbdc0
Merge pull request #2237 from UtahDave/develop
...
Sentence fix
2012-10-12 15:53:10 -07:00
Dave Boucha
7038e81732
Sentence fix
2012-10-12 16:52:08 -06:00
David Boucha
b405294313
Merge pull request #2236 from UtahDave/develop
...
Updated Visual Studio 2008 link
2012-10-12 15:38:47 -07:00
Dave Boucha
5aa5e13a8a
Updated Visual Studio 2008 link
2012-10-12 16:37:09 -06:00
Thomas S Hatch
0fc6fdc0bc
Merge pull request #2234 from abh/patch-2
...
Update doc/topics/tutorials/bootstrap_ec2.rst
2012-10-12 14:13:59 -07:00
Ask Bjørn Hansen
2cefd8f0b1
Fix typo in ref/topology.rst
2012-10-12 13:05:45 -07:00
Ask Bjørn Hansen
a6130890e7
Update doc/topics/tutorials/bootstrap_ec2.rst
...
Simplify and fix sed syntax in bootstrap tutorial
2012-10-12 13:02:12 -07:00
Thomas S Hatch
e8870573a2
mod_watch needs to always return a state dict, Fix #2233
2012-10-12 12:45:49 -06:00
Thomas S Hatch
91d3496b5e
Merge pull request #2232 from s0undt3ch/develop
...
Extend `setup` clean command to remove compiled python files.
2012-10-12 10:10:02 -07:00
Thomas S Hatch
c42176caca
Merge pull request #2231 from s0undt3ch/issues/2227
...
Fix #2227
2012-10-12 10:09:25 -07:00
Thomas S Hatch
69ae9eb02a
Merge pull request #2230 from romeotheriault/fix-user-chgroups-return
...
chgroup updates for linux and freebsd
2012-10-12 10:07:02 -07:00
Pedro Algarvio
3f6d79884f
Extend setuptools clean command to remove compiled python files.
2012-10-12 15:51:28 +01:00
Pedro Algarvio
6533c48014
Just some renames. Refs #2227 .
2012-10-12 11:53:40 +01:00
Pedro Algarvio
ae7e476bfc
Handle some quoting issues while building the whitespace regex for file.append. Fixes #2227 .
2012-10-12 11:45:27 +01:00
Pedro Algarvio
d6d8e22b68
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-10-12 10:57:37 +01:00
Romeo Theriault
abfc8389bc
chgroup updates for linux and freebsd
2012-10-11 22:52:36 -10:00
Thomas S Hatch
c20ef03995
Add the ::
2012-10-11 23:37:20 -06:00
Thomas S Hatch
a6ac5ce8f3
Add some docs
2012-10-11 23:01:18 -06:00
Thomas S Hatch
1855aa8aa1
Uppercase...
2012-10-11 22:43:08 -06:00
Thomas S Hatch
2ed56e6ac3
update pub_refresh to be set to False
2012-10-11 22:37:44 -06:00
Thomas S Hatch
c40b47722c
Using a diff and not specifying that it is a diff in the doc...
...
can be confusing
2012-10-11 22:27:36 -06:00
Thomas S Hatch
8a404fd4c8
Update mod_init docstring as per Daniel Miller's request
2012-10-11 22:08:17 -06:00
Thomas S Hatch
e01eeba447
Fix #2222
2012-10-11 21:38:34 -06:00
Thomas S Hatch
8cfb72f353
Fix ugliness in redis_return
2012-10-11 20:28:42 -06:00
Thomas S Hatch
ddb7b25db8
Merge pull request #2226 from etdub/develop
...
Check if the pkg.arch is 'noarch'
2012-10-11 17:44:43 -07:00
Eric Wong
396e55af65
Check if the pkg.arch is 'noarch'
...
The version should be returned on all platforms if package arch is 'noarch'.
2012-10-11 16:52:50 -07:00
Seth House
b41389e31a
Merge pull request #2221 from seanchannel/patch-1
...
delete older dup of state_verbose
2012-10-11 14:13:19 -07:00
Sean Channel
94451b746b
delete older dup of state_verbose
...
state_verbose appears twice in this file. this change deletes the older one in favor of the more recent addition lower down.
2012-10-11 14:07:05 -07:00
Seth House
c4ff039147
Added a note about the providers minion conf; misc fixes
2012-10-11 14:44:23 -06:00
Seth House
2c76365894
Re-added the index to the built docs
2012-10-11 14:40:40 -06:00
Seth House
207c826cde
Added providers config option to docs
2012-10-11 14:17:10 -06:00
Seth House
362eb62792
Removed newline
2012-10-11 14:01:27 -06:00
Seth House
1c0a0e5965
Removed incorrect colon from function dec in highstate structure
2012-10-11 11:41:15 -06:00
Thomas S Hatch
236089ff2c
Merge pull request #2218 from romeotheriault/add-solaris-user-module
...
Solaris user module
2012-10-11 08:22:51 -07:00
Seth House
4512aa1bb7
Minor rST fixes
2012-10-11 00:36:07 -06:00
Seth House
b845c4a746
Added glossary entry for the module sync system
2012-10-11 00:35:42 -06:00
Seth House
4d35f129f6
Added glossary entry for grains
2012-10-11 00:22:01 -06:00
Seth House
1efeae5e6c
Misc rST fixes and minor text fixes
2012-10-11 00:11:06 -06:00
Seth House
2e0cfc1feb
Added a glossary entry for environments
2012-10-11 00:11:06 -06:00
Thomas S Hatch
418e5af7ce
Add pillar_opts option. This is turned on by default!
...
This adds the master config file options to the pillar, this means
that all of the config data on the master config is available via
pillar now. Fix #1886
2012-10-10 23:53:01 -06:00
