David Boucha
999294fbeb
Merge pull request #2283 from whiteinge/fix-networkingmodule
...
Removed monkey-patching namespace for unused utils module
2012-10-18 11:38:48 -07:00
Thomas S Hatch
fc5d7eda78
Merge pull request #2281 from sjoeboo/develop
...
fix to make puppet.run work with 3.0 upwards, should work on 2.7 and 2.6 release as well
2012-10-18 10:38:37 -07:00
Matthew Nicholson
27f502d018
fix to work with 3.0 upwards, should work on 2.7 and 2.6 release as well
2012-10-18 13:25:08 -04:00
Seth House
7f136cd317
Removed monkey-patching namespace for unused utils module
2012-10-18 11:17:39 -06:00
Daniel Miller
1957700161
Add "file.patch" state function
2012-10-18 12:23:47 -04:00
Daniel Miller
3a68a85a9b
Add "file.patch" module function
2012-10-18 12:20:39 -04:00
Thomas S Hatch
38bbd5fc20
Fix #2267
2012-10-18 00:06:16 -06:00
Thomas S Hatch
d369958db4
Fix issue with file_client not being in the master opts
2012-10-17 22:55:35 -06:00
Thomas S Hatch
267566af17
Fix typo in master_tops doc
2012-10-17 22:39:25 -06:00
Thomas S Hatch
bd5a9be351
Merge pull request #2275 from whiteinge/salt-fix-sanitize_host
...
Salt fix sanitize host
2012-10-17 21:34:48 -07:00
Thomas S Hatch
8df6e8022f
Merge pull request #2272 from FireHost/fix_file_diff
...
Fix the diff orientation for check_file_meta
2012-10-17 21:11:32 -07:00
Thomas S Hatch
0b7efd64a0
Merge pull request #2271 from danielitus/develop
...
Update salt/modules/apt.py
2012-10-17 21:06:53 -07:00
Seth House
1f12ec8b7b
Removed unused star import; replaced star import for single function
2012-10-17 21:50:09 -06:00
Seth House
bf0609fa4e
Fixed regression from 98090c3; made sanitize_host not private
...
Fixes #2274
2012-10-17 21:50:02 -06:00
Thomas S Hatch
ca42e02641
Fix #2240
2012-10-17 19:16:04 -06:00
Aaron Tygart
e196e339b5
Fix the diff orientation for check_file_meta
2012-10-17 17:38:37 -05:00
Thomas S Hatch
5ef188dbec
Always use gettempdir()
2012-10-17 16:28:13 -06:00
Daniel Martinez
fe5bdf745f
Update salt/modules/apt.py
...
Add packages marked as hold.
2012-10-17 18:48:06 -03:00
Thomas S Hatch
cc20940c84
Add interface to accept a low data structure for the runnerclient
2012-10-17 12:31:36 -06:00
David Boucha
4d260e24a0
Merge pull request #2265 from UtahDave/develop
...
Add pillar_ldap documentation to list of pillars
2012-10-17 09:40:45 -07:00
Dave Boucha
d20586ba2f
Add pillar_ldap documentation to list of pillars
2012-10-17 10:36:09 -06:00
David Boucha
c233ea3f5a
Merge pull request #2264 from UtahDave/develop
...
Change reference to returners to pillars
2012-10-17 09:31:24 -07:00
Dave Boucha
e2a7d768e9
Change reference to returners to pillars
2012-10-17 10:30:19 -06:00
Daniel Miller
981465a1b4
Update HACKING.rst instructions for running the tests
...
A recent version of ``virtualenv`` is needed to run the tests. I was getting failures when v1.6.4. I am not positive that 1.8.2 is the lowest version necessary--it is the version that was installed when I ran ``pip install -U virtualenv``.
2012-10-17 11:48:41 -04:00
Thomas S Hatch
13611ebdc1
Merge pull request #2263 from KrisSaxton/develop
...
New aggregrated list support in pillar_ldap; code now pep-8 compliant.
2012-10-17 08:30:52 -07:00
Thomas S Hatch
78dcd9a104
Merge pull request #2260 from romeotheriault/fix-solaris-cron-for-non-root-users
...
fix for cron on solaris with non-root user
2012-10-16 15:54:14 -07:00
Romeo Theriault
9f717dddc6
fix for cron on solaris with non-root user
2012-10-16 12:47:51 -10:00
Thomas S Hatch
de49cef59a
Add master_tops to table of contents
2012-10-16 16:38:51 -06:00
Thomas S Hatch
b57bdefcf6
Add hook for ext_nodes
2012-10-16 16:37:22 -06:00
Thomas S Hatch
ade639390e
Add initial master tops module tracking docs
2012-10-16 16:35:46 -06:00
Thomas S Hatch
b7d7c5aba8
Add docs to ext_nodes
2012-10-16 16:29:09 -06:00
Thomas S Hatch
4efa1d69de
Add master_tops doc
2012-10-16 16:11:11 -06:00
Thomas S Hatch
14d7f5bb72
Merge pull request #2259 from UtahDave/develop
...
Fixes #2062 Fix error when grains are in minion.d/
2012-10-16 15:10:24 -07:00
Dave Boucha
0ff0958595
Fix #2062 Fix error when grains are in minion.d/
...
If the 'default_include' directive was commented out, any grains
existing in the minion.d/*conf files would fail in states.
The grains would appear in salt-call -g
2012-10-16 16:04:59 -06:00
G. Clifford Williams
86abc2ae3a
added wempy to tutoials/starting_states
2012-10-16 14:52:26 -05:00
G. Clifford Williams
c45ad72284
updated man page and index.rst to include wempy
2012-10-16 14:44:31 -05:00
Thomas S Hatch
8518d02ca3
add a slash...
2012-10-16 11:33:18 -06:00
Thomas S Hatch
a63981583f
Merge pull request #2256 from FireHost/add_env_and_sls_to_extend_errors
...
Add envionment and sls information to extend error
2012-10-16 10:23:20 -07:00
Aaron Tygart
b5e9442b17
Add envionment and sls information to extend error
2012-10-16 11:30:51 -05:00
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
