Colton Myers
6a8039d468
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
salt/states/rabbitmq_vhost.py
2015-06-09 11:26:09 -06:00
Justin Findlay
73e6388acd
Merge pull request #24495 from jayeshka/rabbitmq_vhost_states-unit-test
...
adding states/rabbitmq_vhost unit test case.
2015-06-09 09:33:23 -06:00
Justin Findlay
bf1abccebe
Merge pull request #24445 from jayeshka/pyrax_queues_states-unit-test
...
adding states/pyrax_queues unit test case.
2015-06-09 09:28:45 -06:00
Thomas S Hatch
0247e8d10d
Merge pull request #24490 from aneeshusa/fix-pacman-list-upgrades
...
Fix pacman.list_upgrades for new python_shell default.
2015-06-09 09:13:16 -06:00
Thomas S Hatch
6268ddb43a
Merge pull request #24517 from steverweber/ipmi_doc
...
small fixes to the ipmi docs
2015-06-09 09:10:14 -06:00
Jayesh Kariya
31889e38eb
cosmetic change.
2015-06-09 19:44:16 +05:30
Nicole Thomas
3728b3f327
Merge pull request #24524 from jayeshka/rabbitmq_vhost_states-module
...
any() takes list oy tuple.
2015-06-09 07:49:42 -06:00
Jayesh Kariya
01c99ad767
any() takes list oy tuple.
2015-06-09 18:12:53 +05:30
Jayesh Kariya
cf501cf60d
resolved error.
2015-06-09 18:10:37 +05:30
Jayesh Kariya
4bb6087722
Merge branch '2015.5' of https://github.com/saltstack/salt into rabbitmq_vhost_states-unit-test
2015-06-09 18:09:05 +05:30
Nicole Thomas
dd23de885b
Merge pull request #24482 from eliasp/2015.5-states.dockerio-docker.running-doc
...
'docker.running' needs now the 'image' param.
2015-06-08 22:43:04 -06:00
Elias Probst
5de741d626
'docker.running' needs now the 'image' param.
2015-06-09 06:41:33 +02:00
Nicole Thomas
2a727c3f55
Merge pull request #24515 from basepi/susexml23503
...
[2015.5] Add xml library to the salt-thin
2015-06-08 22:10:06 -06:00
Nicole Thomas
6ebc476bb3
Merge pull request #24513 from jquast/2014.7-bugfix-iteritem
...
bugfix use of 'iteritem' in 2014.7 branch
2015-06-08 22:06:36 -06:00
Nicole Thomas
fce998a58b
Merge pull request #24497 from jayeshka/rbenv_states-unit-test
...
adding states/rbenv unit test case.
2015-06-08 21:56:09 -06:00
Nicole Thomas
2bcb4b1eed
Merge pull request #24496 from jayeshka/rabbitmq_user_states-unit-test
...
adding states/rabbitmq_user unit test case.
2015-06-08 21:55:23 -06:00
Steve Weber
6413712844
lint
...
lint
2015-06-08 23:32:05 -04:00
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
Steve Weber
e78aea9b01
more small fixes to the ipmi docs
...
more small fixes to the ipmi docs
2015-06-08 23:01:41 -04: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
Colton Myers
078b33eaaf
Add xml library to the thin
2015-06-08 17:38:11 -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
Jeff Quast
2be0180e5e
bugfix use of 'iteritem' in 2014.7 branch
2015-06-08 14:42:42 -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
Jayesh Kariya
79d343a62b
adding states/rbenv unit test case.
2015-06-08 18:24:24 +05:30
Jayesh Kariya
3ad77143a8
adding states/rabbitmq_vhost unit test case.
2015-06-08 18:23:15 +05:30
Jayesh Kariya
7d96f27f91
adding states/rabbitmq_user unit test case.
2015-06-08 17:47:04 +05:30
Aneesh Agrawal
980e1cb4dc
Lint fix.
2015-06-07 23:54:16 -04:00
Aneesh Agrawal
dca33f1112
Fix pacman.list_upgrades for new python_shell default.
...
2015.5 sets the default for python_shell to False, so the pipe used in
pacman.list_upgrades no longer works. The egrep invocation after the
pipe has the effect of skipping the first output line, which is an
informational message. Instead of piping to egrep, we simply skip the
first line of output when parsing for the available upgrades.
2015-06-07 23:36:05 -04: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
