Joseph Hall
570e538886
Merge pull request #8316 from holmboe/pylint-and-comments
...
In-line comments and typos
2013-11-07 01:10:13 -08:00
Henrik Holmboe
043f9bf85a
Fix typos
2013-11-07 10:06:37 +01:00
Joseph Hall
4a81ac8d74
Merge pull request #8315 from scott-w/develop
...
Initial SQS implementation
2013-11-07 01:06:34 -08:00
Henrik Holmboe
6830f78228
Add explanatory in-line comment regarding single vs double quotes for sshpass
...
It was fixed in 8624b6dcb3
. And since the
Salt coding style is to use single quotes it makes sense to explain in
the code why this needs to be the way it is.
2013-11-07 10:03:32 +01:00
Scott Walton
6f56c316ee
Renamed amazon to aws #6444
2013-11-07 08:58:29 +00:00
Scott Walton
bdcf0af470
Merge remote-tracking branch 'upstream/develop' into develop
2013-11-07 08:37:12 +00:00
Forrest Alvarez
da7fa38d0e
Updated nodegroups with a few clarifications, updated halite docs with a new section on installing via RPM, when the .deb is done another section needs to be added.
2013-11-07 04:50:13 +00:00
Mike Place
302a763ef9
Add dir_mode for file.managed
...
Refs #7860
2013-11-06 21:13:06 -07:00
Thomas S Hatch
d0d684330f
Fix pylint errors
2013-11-06 17:08:22 -07:00
Thomas S Hatch
e64f7b0633
Merge pull request #8311 from s0undt3ch/issues/8196-environments
...
Some more `saltenv` related changes/fixes
2013-11-06 16:07:25 -08:00
Pedro Algarvio
0f9ded1a7a
Fix the pip unit tests with regards to the latest saltenv
changes.
2013-11-06 23:53:45 +00:00
Ken Jung
0d0454a904
Adds use_wheel option to virtualenv state
2013-11-06 16:48:21 -07:00
Pedro Algarvio
ec0a4bca8e
URL environment selection should also be using saltenv
.
2013-11-06 23:36:40 +00:00
Thomas S Hatch
eb36882fc1
minor pylint fixes
2013-11-06 16:36:24 -07:00
Pedro Algarvio
c34640b0f6
The Salt environment deprecations will last until Salt Boron.
2013-11-06 23:16:27 +00:00
Thomas S Hatch
6738451c9e
Merge pull request #8309 from shadowfax-chc/emerge-errors
...
More error reporting in ebuild module
2013-11-06 15:13:42 -08:00
Thomas S Hatch
bb3ca6512f
Merge pull request #8308 from MTecknology/develop
...
Added McAfee OS to rh_service
2013-11-06 15:13:02 -08:00
Thomas S Hatch
85878574a5
Merge pull request #8307 from rsommer/patch-1
...
Use single quotes in cmd string to prevent shell expansion of passwords
2013-11-06 15:12:10 -08:00
Thomas S Hatch
0807fed3e2
Merge pull request #8304 from cachedout/#7944
...
Fix exception when compound matching grains
2013-11-06 15:11:32 -08:00
Thomas S Hatch
c0f6fd68a3
Merge pull request #8303 from basepi/rmcluster
...
Remove confusing "computer clusters" reference from docs
2013-11-06 15:11:17 -08:00
Thomas S Hatch
54a15c575f
Merge pull request #8300 from basepi/publishdocs
...
Add publish example for limiting targets (docs)
2013-11-06 15:11:04 -08:00
Pedro Algarvio
f19ad9bd9d
Take into account __env__
and saltenv
being passed from state files.
2013-11-06 23:10:42 +00:00
Thomas S Hatch
a4b6782999
Merge pull request #8291 from wari/patch-1
...
Refactoring: Removed code duplication
2013-11-06 15:10:23 -08:00
Pedro Algarvio
6e76123a0f
saltenv
is now a known internal keyword.
2013-11-06 23:06:50 +00:00
Pedro Algarvio
3f280b8622
We will start deprecating until Boron.
2013-11-06 23:05:22 +00:00
Thomas S Hatch
68d5b2c21a
Merge pull request #8289 from jacksontj/develop
...
Covering case where kwarg cannot be un-yaml'd
2013-11-06 15:05:14 -08:00
C. R. Oldham
75b49a33e6
Make network.traceroute work better on FreeBSD and MacOS X.
2013-11-06 15:53:04 -07:00
Thomas S Hatch
9af5edee7a
Merge pull request #8287 from holmboe/mknod-state-test-true
...
Honor test=True with friendlier return message in file.mknod state
2013-11-06 14:49:53 -08:00
Pedro Algarvio
b82a051aef
Correctly trigger the issue reported on #8196 .
2013-11-06 22:49:29 +00:00
Pedro Algarvio
3477300d7f
Add a test case to check for proper env selection when passing ?env=foo
. Refs #8196 .
2013-11-06 22:47:55 +00:00
Thomas S Hatch
f7e46978eb
Merge pull request #8282 from cachedout/ssh-opts
...
salt-ssh opts
2013-11-06 14:47:46 -08:00
Pedro Algarvio
943d130e8b
Several PyLint fixes.
2013-11-06 22:44:08 +00:00
Thomas S Hatch
0f149ed23a
Merge pull request #8254 from cachedout/#7691
...
Fix bug preventing minions from unloading custom modules.
2013-11-06 14:40:09 -08:00
Thomas S Hatch
f65d7e46c4
Merge pull request #8251 from heewa/pip_vcs_error_msg
...
Avoid hiding error context in VCS pip install.
2013-11-06 14:37:35 -08:00
Pedro Algarvio
62b7e8c9d1
Add missing commas.
2013-11-06 22:33:01 +00:00
Thomas S Hatch
a343e69d02
Merge pull request #8230 from s0undt3ch/issues/8196-environments
...
Properly pass `__env__` to states.
2013-11-06 14:23:26 -08:00
Michael Lustfield
34a53f9a36
Update rh_service.py
2013-11-06 16:19:16 -06:00
Pedro Algarvio
8c149be174
It's salt.utils
not salt.util
.
2013-11-06 22:17:50 +00:00
Thomas S Hatch
fdcbbbbf16
Merge pull request #8224 from basepi/includeerror8093
...
Make ambiguous or unknown includes failhard always
2013-11-06 14:14:12 -08:00
Michael Lustfield
c28a359173
Update service.py
...
Added McAfee OS (RHEL fork) to the list
2013-11-06 16:14:00 -06:00
Roland Sommer
8624b6dcb3
Use single quotes in command string to prevent shell expansion of passwords
...
When salt-ssh asks for a password to deploy its key it fails if the password contains a '$' because the generated shell command expands the '$' sign and the following characters as shell variable.
Using single quotes prevents shell expansion and passwords containig '$' signs work again.
2013-11-06 23:12:19 +01:00
Pedro Algarvio
fce52f87ee
Deprecate __env__
in favor of saltenv
2013-11-06 22:04:01 +00:00
Pedro Algarvio
9c493ba0e6
Deprecate __env__
and env
in favor of saltenv
2013-11-06 22:00:51 +00:00
Pedro Algarvio
69c3bf328b
Deprecate __env__
and env
in favor of saltenv
2013-11-06 21:54:53 +00:00
Pedro Algarvio
7601e46825
Deprecate __env__
in favor of saltenv
2013-11-06 21:54:05 +00:00
Thomas S Hatch
efd6579805
Merge pull request #8222 from cro/track_mine_processes
...
Track mine processes, fixes #5729
2013-11-06 13:53:18 -08:00
Thomas S Hatch
1fb7f59700
Merge pull request #8217 from cachedout/file_traversal_fixing
...
File traversal fixing #6928
2013-11-06 13:49:27 -08:00
C. R. Oldham
c2caf83aa0
Complete support for restricting scheduled process running.
2013-11-06 14:48:17 -07:00
C. R. Oldham
464aea10b9
Complete support for restricting scheduled process running.
2013-11-06 14:47:34 -07:00
Pedro Algarvio
b253cfa9d8
Merge pull request #8305 from terminalmage/tests
...
Add CLI arg parser tests
2013-11-06 13:08:23 -08:00