Pedro Algarvio
fcd7fcc436
Merge branch 'develop' of github.com:saltstack/salt into issues/2068
2012-09-28 00:10:25 +01:00
Thomas S Hatch
9b360232bd
Fix for #2068 , needs testing
2012-09-27 17:06:32 -06:00
Pedro Algarvio
60fe1695a3
Merge branch 'develop' of github.com:saltstack/salt into issues/2068
2012-09-27 23:43:29 +01:00
Thomas S Hatch
a7d516ab6a
Merge pull request #2124 from FireHost/cleaner_platform_detect
...
Add slightly nicer platform detection
2012-09-27 15:35:03 -07:00
Aaron Tygart
f8df121204
Add slightly nicer platform detection
2012-09-27 17:30:47 -05:00
Thomas S Hatch
18ad1064cc
Merge pull request #2122 from morganfainberg/develop
...
Fix Test Errors now that FileSystemLoader is used for fallback
2012-09-27 15:11:38 -07:00
Morgan Fainberg
7800157e37
Fix the test for jinja, local (non salt:// files) now can support {% include %}
2012-09-27 14:55:55 -07:00
Thomas S Hatch
857cff66af
Fix #458
2012-09-27 15:40:17 -06:00
Thomas S Hatch
2544cf4f08
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-09-27 15:08:11 -06:00
Thomas S Hatch
5ce30381ae
Remove stray print statement, Fix #2121
2012-09-27 15:07:43 -06:00
Thomas S Hatch
e066a8f3c6
Merge pull request #2120 from scott-w/develop
...
Supervisor Stop State
2012-09-27 13:48:24 -07:00
Seth House
184e4bbd22
Added note about #salt-devel
2012-09-27 13:54:13 -06:00
Scott Walton
ce4237e2bd
Fixed test failures #2026
2012-09-27 20:04:18 +01:00
Thomas S Hatch
7410ec43d6
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-09-27 12:43:39 -06:00
Thomas S Hatch
1c719f62cc
Seed the success key
2012-09-27 12:40:46 -06:00
Scott Walton
768487995d
Merge remote-tracking branch 'upstream/develop' into develop
2012-09-27 19:35:13 +01:00
Thomas S Hatch
01175b9e16
Merge pull request #2119 from FireHost/fix_os_fullnames
...
Add 'osfullname' grain. Fix 'os' grain long names
2012-09-27 11:31:08 -07:00
Aaron Tygart
26ffc5ef7d
Add 'osfullname' grain. Fix 'os' grain long names
2012-09-27 13:22:34 -05:00
Pedro Algarvio
fb2b87a675
Merge branch 'develop' of github.com:saltstack/salt into issues/2068
2012-09-27 19:08:13 +01:00
Pedro Algarvio
6e2ba6885e
Fix test case assertion.
2012-09-27 18:43:15 +01:00
Thomas S Hatch
1dec24b158
Merge pull request #2116 from s0undt3ch/issues/2113
...
The pip module now uses `cmd.run_all`. Fixes #2113 .
2012-09-27 10:41:02 -07:00
Pedro Algarvio
eec932799a
The pip module now uses cmd.run_all. Fixes #2113 .
...
* In order to check if something went wrong while running the various pip commands using the command module, we need to know, at least, the return code, this way we can report the failure.
* `salt.modules.pip.uninstall()` now returns the `cmd.run_all` `dict` instead of a list of strings. **This breaks previous behaviour**.
* Added a test case for `salt.modules.pip.uninstall()` changes.
2012-09-27 18:33:50 +01:00
Thomas S Hatch
c5b5e591c5
Some more on the docstring
2012-09-27 11:09:54 -06:00
Thomas S Hatch
d287e75738
Merge pull request #2115 from gekitsuu/develop
...
Added doc string to "interfaces" in modules/network.py
2012-09-27 10:05:55 -07:00
Adam Glenn
8f58f99a88
Added doc string to "interfaces"
2012-09-27 12:18:08 -04:00
Thomas S Hatch
36d4f9766b
Merge pull request #2110 from DarkSinclair/develop
...
Allowing source in file.recurse to be a list object, as in file.manage. ...
2012-09-27 09:13:48 -07:00
Thomas S Hatch
77a2570a12
Merge pull request #2109 from s0undt3ch/issues/2087
...
Fix #2087 and #2098
2012-09-27 09:05:32 -07:00
Ian Sinclair
4d712e26c0
Allowing source in file.recurse to be a list object, as in file.manage. This also includes the to specify salt-call cp.list_master_dirs
2012-09-27 09:22:53 -04:00
Pedro Algarvio
af9709dde5
Properly handle missing pip binary. Fixes #2087 .
2012-09-27 12:06:09 +01:00
Pedro Algarvio
33aa55f905
Use a PyPI mirror for installing packages. Fixes #2098 .
...
For now we're using `http://testpypi.python.org/pypi ` as the mirror.
2012-09-27 11:55:00 +01:00
Pedro Algarvio
9c72fac67e
Merge branch 'develop' of github.com:saltstack/salt into issues/2087
2012-09-27 11:40:55 +01:00
Pedro Algarvio
4185e89487
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-09-27 11:39:51 +01:00
Pedro Algarvio
b0017f0e5a
Make sure the tests logging handler catches all messages when active.
2012-09-27 11:39:26 +01:00
Pedro Algarvio
fc31a6b213
Merge branch 'develop' of github.com:saltstack/salt into issues/2087
2012-09-27 11:16:45 +01:00
Thomas S Hatch
06e3f4035b
Merge pull request #2107 from FireHost/fix_file_managed_diff
...
Fix reversed diff on file.managed
2012-09-26 19:29:47 -07:00
Aaron Tygart
4013bfeeb0
Fix reversed diff on file.managed
2012-09-26 21:20:29 -05:00
Thomas S Hatch
40002fae22
Move close_fds into the non windows bin
2012-09-26 20:18:25 -06:00
Thomas S Hatch
8e67a570b6
Merge pull request #2105 from FireHost/fix_missing_jinja_import
...
Fix missing FileSystemLoader import
2012-09-26 14:42:57 -07:00
Aaron Tygart
1c7d749b06
Fix missing FileSystemLoader import
2012-09-26 16:40:29 -05:00
Thomas S Hatch
68e667d4b1
Merge pull request #2104 from seanchannel/develop
...
missing 4 params
2012-09-26 13:40:45 -07:00
Sean Channel
a953b32cc7
new to python?
2012-09-26 13:38:38 -07:00
Sean Channel
6e152b296e
missing 4 params
2012-09-26 13:33:58 -07:00
Thomas S Hatch
ffb52e7817
Merge pull request #2103 from morganfainberg/develop
...
Fixes 2071
2012-09-26 13:07:57 -07:00
Morgan Fainberg
7b9280b40d
A Loader is needed to handle Jinja includes (etc).
...
Fixes the ability to utilize {% include %} (and other similar jinja
specifics) in pillar data. This is an issue since pillar is rendered
on the master but is outside the SaltCache loader's search path.
The simplest solution is to use the FileSystemLoader instead of directly
reading the files off disk.
2012-09-26 12:52:26 -07:00
Thomas S Hatch
066d80f908
Merge pull request #2102 from seanchannel/develop
...
missing line termination
2012-09-26 11:58:17 -07:00
Sean Channel
bd85731f2e
missing line termination
2012-09-26 11:45:26 -07:00
Thomas S Hatch
4798abb19c
Merge pull request #2101 from DarkSinclair/develop
...
file.managed functionality to enforce filesystem permissions when source...
2012-09-26 10:55:44 -07:00
Ian Sinclair
3ed3433e15
file.managed functionality to enforce filesystem permissions when source is None and replace is False
2012-09-26 13:36:24 -04:00
Thomas S Hatch
e043e52a1a
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-09-26 11:10:09 -06:00
Thomas S Hatch
118387de7b
Fix #2057
2012-09-26 11:09:30 -06:00
