G. Clifford Williams
1c5042c2ec
added wempy to list in ./doc/ref/renderers/index.rst
2012-10-16 11:21:00 -05:00
G. Clifford Williams
69e44a8c3a
added wempy to template docs in states/file.py
2012-10-16 11:17:22 -05:00
G. Clifford Williams
3c742d6d83
added wempy info to minion.template
2012-10-16 11:11:37 -05:00
Thomas S Hatch
ebbd13647d
Merge pull request #2255 from FireHost/add_env_to_state_errors
...
Add environment to duplicate id error to aid debug
2012-10-16 08:48:42 -07:00
Thomas S Hatch
2e3bb1fe73
Merge pull request #2254 from UtahDave/develop
...
Update docs regarding recent update to salt-key -d
2012-10-16 08:47:56 -07:00
Aaron Tygart
9902b56253
Add environment to duplicate id error to aid debug
2012-10-16 10:35:19 -05:00
Dave Boucha
acdbd79652
Update docs regarding recent update to salt-key -d
2012-10-16 09:31:49 -06:00
Kris Saxton
f63d4fce45
New aggregrated list support in pillar_ldap; code now pep-8 compliant.
2012-10-16 14:56:45 +01:00
Thomas S Hatch
4177087097
When a cron with trailing whitespace is sent in it fails to match
...
This strip will fix #2202
2012-10-15 23:03:43 -06:00
Thomas S Hatch
c1fc9d6726
fix sock_dir change for eventlisten script
2012-10-15 22:50:31 -06:00
Thomas S Hatch
ef7cfcb4b2
Make minion event tags just be tags, no id
2012-10-15 22:44:13 -06:00
Thomas S Hatch
f471754241
Fix for #2193
2012-10-15 22:37:21 -06:00
Thomas S Hatch
d9496cabcf
Fix #2030
2012-10-15 21:58:54 -06:00
Thomas S Hatch
ae56e3b778
Merge pull request #2252 from UtahDave/add_loopback_to_ip_addrs
...
Allow deleting minions by glob.
2012-10-15 18:09:17 -07:00
Dave Boucha
40c91a309a
Allow deleting minions by glob.
...
example: salt-key -d 'ms-*'
2012-10-15 19:06:14 -06:00
Thomas S Hatch
16c76acdd2
Fix #1821
2012-10-15 18:47:07 -06:00
Thomas S Hatch
ff83cdb05d
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-10-15 18:43:12 -06:00
Thomas S Hatch
7c7a2f88d5
fix ext_nodes top module
2012-10-15 18:39:49 -06:00
Thomas S Hatch
a3dc8c925f
Merge pull request #2251 from UtahDave/add_loopback_to_ip_addrs
...
Add loopback to ip addrs
2012-10-15 16:55:45 -07:00
Thomas S Hatch
a826375b15
Merge pull request #2250 from whiteinge/salt-pip-test-bashism
...
Remove bash-ism from pip state test
2012-10-15 16:55:07 -07:00
Dave Boucha
2632b13389
Merge branch 'develop' of github.com:saltstack/salt into add_loopback_to_ip_addrs
2012-10-15 15:48:01 -06:00
Dave Boucha
7c02026a6b
Add documentation to network.ip_addrs
...
Add note to the documentation that include_loopback=True
will add the loopback address to returned results
2012-10-15 15:46:59 -06:00
Seth House
2e9ecdbaa4
Remove bash-ism from pip state test
...
This one is pretty silly; hopefully the regex match is still specific
enough to be a good test.
% bash -c '/tmp/someenv/bin/pip install something'
bash: /tmp/someenv/bin/pip: No such file or directory
% zsh -c '/tmp/someenv/bin/pip install something'
zsh:1: no such file or directory: /tmp/someenv/bin/pip
2012-10-15 15:31:47 -06:00
Seth House
5330026341
Tweak conf.py for moar quieter pylint
2012-10-15 14:26:11 -06:00
Dave Boucha
c91c8da4cf
Add include_loopback to network.ip_addrs
...
setting include_loopback to True will cause network.ip_addrs and
network.ip_addrs6 to include the local loopback address in the
list of IP addresses.
2012-10-15 13:22:51 -06:00
Thomas S Hatch
1b8e323559
Merge pull request #2248 from FireHost/fix_broken_esky_doc_link
...
Fix broken esky documentation reference
2012-10-15 08:30:37 -07:00
Thomas S Hatch
bb14042a64
Merge pull request #2246 from romeotheriault/solaris-pkg-current-zone-only
...
Add support for current zone only pkgadd feature.
2012-10-15 08:30:20 -07:00
Aaron Tygart
c0ed789950
Fix broken esky documentation reference
2012-10-15 10:18:40 -05:00
Romeo Theriault
7a62c5960e
Add support for current zone only pkgadd feature. Useful for installing packages only in the global zone
2012-10-14 22:48:56 -10:00
Thomas S Hatch
bd44832230
Merge pull request #2244 from FireHost/toplevel_wmi_import
...
Toplevel wmi import
2012-10-14 20:20:58 -07:00
Thomas S Hatch
85eb3cf3ba
Spellin' fix
2012-10-14 21:16:03 -06:00
Aaron Tygart
fff6722930
Whitespace cleanup. Remove a debug import.
2012-10-14 21:43:10 -05:00
Aaron Tygart
c8a13af734
Move wmi import to module level
2012-10-14 21:40:10 -05:00
Thomas S Hatch
2f06c7e2ed
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-10-14 15:43:43 -06:00
Thomas S Hatch
4de3b077c2
Accept updated pillar system
2012-10-14 15:43:23 -06:00
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
