Jacob Hammons
c7cdd416a2
Doc bug fixes
...
Refs #24547
Refs #24275
Refs #24375
Refs #24560
Refs #24163
2015-06-12 11:23:52 -06:00
Thomas S Hatch
0ff545c549
Merge pull request #24600 from basepi/salt-ssh.orchestrate.20615
...
[2015.5] Remove __kwarg__ from salt-ssh keyword args
2015-06-11 22:21:29 -06:00
Colton Myers
832916f49f
Merge pull request #24608 from basepi/salt-ssh.flat.roster.integers.22843
...
[2015.5] Normalize salt-ssh flat roster minion IDs to strings
2015-06-11 15:35:07 -06:00
Colton Myers
381820f051
Normalize salt-ssh flat roster minion IDs to strings
...
Fixes #22843
2015-06-11 14:18:04 -06:00
Colton Myers
4eb5bb253b
Merge pull request #24605 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-06-11 13:15:21 -06:00
Colton Myers
f96c5029bb
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-06-11 13:14:37 -06:00
Colton Myers
9b55683f6a
Remove __kwarg__ from salt-ssh keyword args
...
Currently this keyword arg is actually being removed as a side effect
of salt.utils.args.parse_input. If that ever changed then this code
would break. Prevent that future breakage. (I considered removing that
side effect but wasn't sure what else it would break so I held off for
now)
2015-06-11 12:04:57 -06:00
Thomas S Hatch
e0bb177823
Merge pull request #24598 from jacobhammons/doc-fixes
...
2015.5.2 release changes
2015-06-11 11:24:11 -06:00
Thomas S Hatch
26930b45bd
Merge pull request #24588 from basepi/salt-ssh.orchestrate.20615
...
Fixes for saltmod.function for salt-ssh
2015-06-11 10:15:20 -06:00
Jacob Hammons
f3f34ddff6
2015.5.2 release changes
...
Refs #24250
Refs #24457
2015-06-11 10:01:30 -06:00
Justin Findlay
5a21ad152e
Merge pull request #24593 from jayeshka/redismod_states-unit-test
...
adding states/redismod unit test case.
2015-06-11 09:55:27 -06:00
Justin Findlay
8ffb86edd0
Merge pull request #24581 from rallytime/disable_some_flaky_tests
...
Disabled some flaky tests until we can figure out how to make them more reliable
2015-06-11 09:51:41 -06:00
Nicole Thomas
d83928a7f9
Merge pull request #24589 from BretFisher/patch-1
...
Fixed Mine example for jinja code block
2015-06-11 09:48:02 -06:00
Jayesh Kariya
3b95744840
adding states/redismod unit test case.
2015-06-11 17:42:15 +05:30
Bret Fisher
65a11336dc
Fixed Mine example for jinja code block
...
In the Mine example, it has the `mine_functions:` deployed via a pillar file, but in the examples `/srv/salt/haproxy_config` snipit for the jinja code block, it used `expr_form='grain'` to access that mine function, which I couldn't get to work, until I changed it to `expr_form='pillar'`. Hopefully this is the right fix.
2015-06-11 00:50:34 -04:00
Thomas S Hatch
a570d7f967
Merge pull request #24566 from jayeshka/rdp_states-unit-test
...
adding states/rdp unit test case.
2015-06-10 20:14:39 -06:00
Thomas S Hatch
20ada1f8a1
Merge pull request #24551 from joejulian/2015.5_dont_pollute_environment
...
2015.5 dont pollute environment
2015-06-10 20:13:06 -06:00
Colton Myers
826936ce57
Move documentation into docstring instead of comments
2015-06-10 18:59:11 -06:00
Colton Myers
de052e7135
Assign 'return' to 'ret' if necessary in saltmod.function
2015-06-10 18:58:22 -06:00
Colton Myers
34ff989d66
Convert keyword args to key=value strings in salt-ssh
2015-06-10 18:58:08 -06:00
Nicole Thomas
bb2fd6a970
Merge pull request #24574 from jacobhammons/19901
...
Refs #19901
2015-06-10 14:09:23 -06:00
rallytime
c82f135d2e
Disabled some flaky tests until we can figure out how to make them more reliable
2015-06-10 14:04:14 -06:00
Colton Myers
b03166cde3
Merge pull request #24577 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-06-10 13:46:22 -06:00
Colton Myers
e1d45ccf3b
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-06-10 12:02:42 -06:00
Jacob Hammons
e2a2946dc7
Refs #19901
2015-06-10 11:31:37 -06:00
Nicole Thomas
3ec457beef
Merge pull request #24571 from jacobhammons/24235
...
Refs #24235
2015-06-10 11:02:18 -06:00
Nicole Thomas
fe07eb5653
Merge pull request #24565 from pille/munin-ignore-broken-symlinks
...
fix backtrace, when listing plugins
2015-06-10 10:33:11 -06:00
Jacob Hammons
8df5d53bb8
Refs #24235
2015-06-10 09:45:03 -06:00
Jayesh Kariya
273b994e91
adding states/rdp unit test case.
2015-06-10 18:41:29 +05:30
pille
8511a6c0a6
fix backtrace, when listing plugins
...
munin usually symlinks its plugins in /etc/munin/plugins.
this catches the case that the symlink is broken.
2015-06-10 14:44:47 +02:00
Nicole Thomas
251c8f9f5f
Merge pull request #24554 from lyft/pecl-module-fix
...
Fix yes usage for pecl defaults
2015-06-09 17:59:49 -06:00
Ryan Lane
56a9cfcf24
Fix yes usage for pecl defaults
2015-06-09 14:53:11 -07:00
Justin Findlay
d376390f76
Merge pull request #24530 from twangboy/fix_24427
...
Start Minion Service on Silent Install
2015-06-09 15:30:08 -06:00
Joe Julian
cfc3b43ba2
Don't pollute the TZ environment variable
2015-06-09 14:26:27 -07:00
Thomas S Hatch
dbd49b4acb
Merge pull request #24535 from rallytime/bp-24518
...
Back-port #24518 to 2015.5
2015-06-09 14:06:18 -06:00
Joe Julian
cba8d3f923
pep8
2015-06-09 12:50:36 -07:00
Joe Julian
9cb7015568
Mark keyword version adds
2015-06-09 12:50:24 -07:00
Joe Julian
76e2583265
Merge tls changes from develop
2015-06-09 12:48:36 -07:00
Colton Myers
485ed3cff9
Merge pull request #24538 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-06-09 11:27:20 -06:00
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
rallytime
fc75197616
Pylint fix
2015-06-09 10:51:32 -06:00
Andrei Nistor
3e08840988
Update modules path for operating systems using systemd
2015-06-09 10:51:31 -06:00
twangboy
673e1d809e
Added missing panel.bmp for installer
2015-06-09 10:28:09 -06:00
twangboy
cc50218b01
Start Minion Service on Silent Install
2015-06-09 09:34:41 -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
