Colton Myers
b896a0d0e9
Merge pull request #24642 from saltstack/revert-24595-fix-iptables-target
...
Revert "fix target rule, remove unneeded quotation mark"
2015-06-12 14:14:26 -06:00
Colton Myers
5ff3224ae1
Revert "fix target rule, remove unneeded quotation mark"
2015-06-12 14:14:08 -06:00
David Boucha
635121e85d
Merge pull request #24620 from twangboy/fix_24215
...
Fixed comment and uncomment functions in file.py
2015-06-12 13:36:26 -06:00
Justin Findlay
01092c2337
Merge pull request #24628 from jayeshka/reg_states-unit-test
...
adding states/reg unit test case.
2015-06-12 11:29:11 -06:00
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
5f491f911d
Merge pull request #24631 from rallytime/bp-24591
...
Back-port #24591 to 2015.5
2015-06-12 10:54:32 -06:00
Tim Baker
f13cd418bc
Add extra clarification why jinja comments are needed.
2015-06-12 10:45:41 -06:00
Tim Baker
23749718bb
Fix typo
2015-06-12 10:45:41 -06:00
Tim Baker
6a917471d4
Add some documentation surrounding Jinja comments - refs #24492 , #21217 , #23359
2015-06-12 10:45:41 -06:00
Thomas S Hatch
f23f99ec35
Merge pull request #24616 from garethgreenaway/2015_5_logging_disabled_states
...
additional logging in state.py module
2015-06-12 10:25:39 -06:00
Thomas S Hatch
6dccbb04a1
Merge pull request #24595 from tankywoo/fix-iptables-target
...
fix target rule, remove unneeded quotation mark
2015-06-12 10:23:22 -06:00
Nicole Thomas
8ac3d94785
Merge pull request #24604 from jfindlay/pkg_tests
...
fix pkg module integration tests
2015-06-12 10:04:26 -06:00
Jayesh Kariya
af1bd8f9ff
adding states/reg unit test case.
2015-06-12 17:23:41 +05:30
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
twangboy
d7a9999be1
Fixed comment and uncomment functions in file.py
2015-06-11 20:34:57 -06:00
Tanky Woo
10a5160d7c
fix target rule, remove unneeded quotation mark
2015-06-12 08:32:38 +08:00
Gareth J. Greenaway
4dbf0ef160
Adding some logging statement to give feedback when states, including highstate, are disabled. Useful when running from scheduler.
2015-06-11 16:42:03 -07: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
Justin Findlay
d88fb22fdc
fix pkg module integration tests on CentOS 5
2015-06-11 14:56:52 -06:00
Colton Myers
381820f051
Normalize salt-ssh flat roster minion IDs to strings
...
Fixes #22843
2015-06-11 14:18:04 -06:00
Gareth J. Greenaway
8abd3f0ee1
A fix if you have multiple masters configured and try to fire events to the minion. Currently they fail silently. Might be the cause of #24198 .
2015-06-11 12:54:55 -07: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
Justin Findlay
fb91b40ba0
fix pkg module integration tests on ubuntu 12
2015-06-11 12:46:22 -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
