Nicole Thomas
02a597bf49
Merge pull request #24481 from eliasp/2015.5-salt.states.powerpath-license_typo
...
Fix typo (licnese → license).
2015-06-08 21:30:25 -06:00
Thomas S Hatch
5ad3db5ffb
Merge pull request #24467 from thenewwazoo/fix-dockerio-bound-volumes
...
Fix dockerio bound volumes
2015-06-08 19:40:23 -06:00
C. R. Oldham
d236fbd38f
Merge pull request #24504 from rallytime/move_vsphere_deprecation_2015.5
...
Move vsphere deprecation to 2015.5
2015-06-08 16:43:05 -06:00
C. R. Oldham
cb5546085c
Merge pull request #24506 from rallytime/bp-24450
...
Backport #24450 to 2015.5
2015-06-08 16:42:14 -06:00
Brandon Matthews
db4e3dc69b
Let's raise an exception if create fails
2015-06-08 15:21:27 -07:00
Brandon Matthews
d1d85dd685
Add logging
2015-06-08 15:21:27 -07:00
Brandon Matthews
ddc63f0f30
Fix volume handling when creating containers
...
Fixes #24455
2015-06-08 15:21:27 -07:00
rallytime
1c0fca2b9d
Backport #24450 to 2015.5
...
Backport #24450 to 2015.5
2015-06-08 10:43:10 -06:00
rallytime
d876535d71
Add Getting Started with VSphere doc to 2015.5
2015-06-08 10:23:47 -06:00
rallytime
b685ebc104
Add vSphere deprecation warnings to 2015.5
2015-06-08 10:22:50 -06:00
Nicole Thomas
3173fd17ad
Merge pull request #24498 from rallytime/fix_doc_failure_fifteen
...
Added "CLI Example" to make failing test happy on 2015.5
2015-06-08 09:48:40 -06:00
Thomas S Hatch
3639e411bd
Merge pull request #24471 from alprs/fix-salt_ssh_logging
...
Set up salt-ssh file logging
2015-06-08 09:26:49 -06:00
Thomas S Hatch
551e70f3fb
Merge pull request #24469 from jfindlay/npm_env
...
correctly handle user environment info for npm
2015-06-08 09:26:02 -06:00
Thomas S Hatch
0d9e0c2b8c
Merge pull request #24468 from jacobhammons/doc-fixes
...
Bug fixes and build errors
2015-06-08 09:25:40 -06:00
Thomas S Hatch
be6905a545
Merge pull request #24465 from jfindlay/unknown_ppa
...
catch exception from softwarerepositories
2015-06-08 09:25:19 -06:00
Thomas S Hatch
58d1ea8fe8
Merge pull request #24464 from jfindlay/file_mkdir
...
fix typo in modules/mount.py
2015-06-08 09:25:07 -06:00
Thomas S Hatch
4f332a71c6
Merge pull request #24461 from dkiser/multimaster_minion_fix
...
fix for #24434
2015-06-08 09:24:53 -06:00
rallytime
d992ef4777
Added "CLI Example" to make failing test happy on 2015.5
2015-06-08 08:45:59 -06:00
Nicole Thomas
8917416d39
Merge pull request #24479 from ahus1/patch-1
...
change "path" to "name" for "file" operations
2015-06-07 11:56:11 -06:00
Elias Probst
1280054bce
Fix typo (licnese → license).
2015-06-07 15:59:27 +02:00
Alexander Schwartz
7d6b60c79d
change "path" to "name" for "file" operations
...
Path is no supported parameter for any file operation (maybe it has been in the past)
2015-06-07 13:14:26 +02:00
Justin Findlay
8618d5b6ea
Merge pull request #24475 from rallytime/bp-24454
...
Back-port #24454 to 2015.5
2015-06-06 19:29:32 -06:00
Justin Findlay
61658ffef7
Merge pull request #24474 from rallytime/bp-24420
...
Back-port #24420 to 2015.5
2015-06-06 19:29:11 -06:00
Raphaël Hertzog
a793c192a6
Avoid extraneous newline character added in last environment variable
...
The print statement used to dump the environment associated to the 'runas'
user adds a trailing newline at the end of the string. This newline is
kept and injected in the value of the last environment variable. Most of
the time, it is innocuous but in some cases it can have serious
consequences.
In my case, the last variable was HOME and the trailing newline broke the
command that salt was executing because it was not able to create a file
in the home directory (which was non-existing).
Sponsored-By: Offensive Security
Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
2015-06-06 17:21:16 -06:00
Niels Abspoel
4219b404ad
Fix lint error and update versionadded to 2015.5.3
2015-06-06 17:20:02 -06:00
Niels Abspoel
3613cc9659
added random integer module to mod_random.py
...
fixes #24407 this will help solve it
2015-06-06 17:20:01 -06:00
Jacob Hammons
1035959459
Appended .0 to version added
2015-06-06 12:38:59 -06:00
Justin Findlay
508d7ddb91
Merge pull request #24472 from variia/Fix-yumpkg_group_install-return-change-#24233
...
ensure {} output is not treated as change in module.py state, fixes #…
2015-06-06 08:45:44 -06:00
Justin Findlay
0292e67c8a
Merge pull request #24466 from basepi/fixhashinargs18045
...
[2015.5] Fix for # in inner strings in yaml arguments
2015-06-06 08:35:56 -06:00
Ivan Vari
37e8827ce8
ensure {} output is not treated as change in module.py state, fixes #24233
2015-06-06 23:03:55 +12:00
Andreas Lutro
6a11ec87b8
set up salt-ssh file logging
2015-06-06 12:02:52 +02:00
Justin Findlay
8140c96949
update npm's user info envs
...
Proposed fix for #24231 .
2015-06-05 19:26:05 -06:00
Justin Findlay
cb572f8c41
add env parameter to npm.uninstall
2015-06-05 19:26:05 -06:00
Jacob Hammons
d45c4ed11f
Bug fixes and build errors
...
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
2015-06-05 17:32:35 -06:00
Colton Myers
2e0609f09e
Fix for # in inner strings in yaml arguments
...
Fixes #18045
The fix for #8585 should still be intact
2015-06-05 17:17:43 -06:00
Justin Findlay
19c912866d
catch exception from softwarerepositories
...
Fixes #24318 .
2015-06-05 16:53:53 -06:00
Nicole Thomas
ced558a6e6
Merge pull request #24456 from rallytime/bp-24441
...
Back-port #24441 to 2015.5
2015-06-05 16:32:25 -06:00
Justin Findlay
6e8cd44500
fix typo in modules/mount.py
...
Fixes #24296 .
2015-06-05 16:21:12 -06:00
dkiser
1944a743d7
fix for #24434
2015-06-05 14:13:25 -07:00
Colton Myers
c0ff4110ab
Merge pull request #24398 from makinacorpus/aptv
...
VirtualName for states.apt
2015-06-05 11:40:04 -06:00
rallytime
70028553c1
yaml indentations should be 2 spaces
2015-06-05 11:21:26 -06:00
Arthur Lutz
21b51abf25
[doc] Alignement fix on external_auth documentation
2015-06-05 11:20:00 -06:00
Justin Findlay
36263405be
Merge pull request #24447 from jayeshka/rabbitmq_policy_states-unit-test
...
adding states/rabbitmq_policy unit test case.
2015-06-05 09:26:10 -06:00
Justin Findlay
8445a3f28d
Merge pull request #24446 from jayeshka/rabbitmq_plugin_states-unit-test
...
adding states/rabbitmq_plugin unit test case.
2015-06-05 09:25:32 -06:00
Jayesh Kariya
9b038abd63
adding states/rabbitmq_policy unit test case.
2015-06-05 17:35:31 +05:30
Jayesh Kariya
cb0c99a012
adding states/rabbitmq_plugin unit test case.
2015-06-05 17:33:49 +05:30
Mathieu Le Marec - Pasquet
785d27707f
VirtualName for states.apt
...
This fixes #24397
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-06-05 09:45:52 +02:00
Justin Findlay
9cc3808758
Merge pull request #24426 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-06-04 21:59:11 -06:00
Nicole Thomas
5d738b8dab
Merge pull request #24429 from jacobhammons/cloud-doc-updates
...
Salt cloud doc updates, build errors and bug fixes
2015-06-04 18:27:38 -06:00
Jacob Hammons
1f7a13d6f9
Salt cloud doc updates, build errors and bug fixes
...
Refs #24309
2015-06-04 16:42:47 -06:00
