Jayesh Kariya
ec50450460
adding states/mysql_query unit test case
2015-05-25 15:59:25 +05:30
Jayesh Kariya
11a93cb80c
adding states/mysql_grants unit test case
2015-05-25 15:58:10 +05:30
Justin Findlay
6b43c9a8cb
Merge pull request #24028 from nleib/2015.5
...
send a disable message to disable puppet
2015-05-24 22:02:11 -06:00
Justin Findlay
2b8175e351
contains_regex_multiline -> search in kmod module
2015-05-24 21:59:13 -06:00
Justin Findlay
422b5f074d
contains_regex_multiline -> search in file state
2015-05-24 21:59:13 -06:00
Justin Findlay
c6004f8dca
deprecate file.contains_regex_multiline with file.search
2015-05-24 21:59:13 -06:00
Justin Findlay
92a054d0fd
enable multiline searching with file.replace
2015-05-24 21:59:13 -06:00
Christer Edwards
4552e6eb7b
Updated some beacon-specific documentation formatting
2015-05-24 20:57:06 -06:00
Pablo Ruiz
cd48a95e1d
Only try to stop a VM if it's not already stopped. ( fixes #23364 )
2015-05-25 01:46:06 +02:00
nleib
15f24b42b2
update format of string in disabled msg
2015-05-24 11:27:31 +03:00
Justin Findlay
7a5612a25e
update and expand re flags handling in file mod
2015-05-24 02:10:17 -06:00
Justin Findlay
cf26ab7d12
fix typo in salt.utils.filebuffer
2015-05-24 00:32:41 -06:00
Justin Findlay
52c9acafc2
Merge pull request #24100 from jfindlay/merge_23963
...
adding states/file unit test case
2015-05-23 23:17:54 -06:00
Jayesh Kariya
7d59deb3d6
adding states/file unit test case
2015-05-23 22:22:32 -06:00
Justin Findlay
0eb9f15d20
Merge pull request #24098 from galet/2015.5
...
Systemd not recognized properly on Oracle Linux 7
2015-05-23 22:07:30 -06:00
Justin Findlay
f1bd5ec404
adding pkg module integration tests
2015-05-23 19:34:37 -06:00
Michal Galet
4d6ab21c74
Systemd not recognized properly on Oracle Linux 7
...
Both systemd and rh_service modules were enabled which led to a strange situation where:
- state.sls or state.highstate were failing on service state
- state.sls_id was passing on the called service
2015-05-23 22:28:39 +02:00
Michael Steed
fd35903d75
Fix failing test
...
- In Batch.__gather_minions(), call cmd_iter() instead of
cmd_iter_no_block(), since the effect was to block inside
__gather_minions() anyway, and the timeout was already being passed to
cmd_iter()
- Tidy up some docstrings
2015-05-23 09:07:03 -06:00
nleib
7690e5b008
remove trailing whitespaces
2015-05-23 17:44:34 +03:00
Nicolas Delaby
82ee2da750
Enforce environment values to be strings.
2015-05-23 15:52:36 +02:00
nleib
56a972034f
Update puppet.py
2015-05-23 16:22:29 +03:00
Justin Findlay
cfa0f1358e
collect scattered contents edits, ensure it's a str
...
Fixes #23973 .
2015-05-23 00:14:28 -06:00
Nicole Thomas
7646cb16ea
Merge pull request #24091 from rallytime/revert_test_removal
...
Revert "Remove key management test from digital ocean cloud tests"
2015-05-22 17:10:37 -06:00
Nicole Thomas
522ae92e38
Merge pull request #24079 from saltstack/revert-24061-develop
...
Revert "Fix for https://github.com/saltstack/salt/issues/23221 "
2015-05-22 17:08:53 -06:00
Nicole Thomas
810297c847
Merge pull request #24069 from ticosax/check_is_running
...
[dockerng] Introduce "start" argument to dockerng.running
2015-05-22 17:04:38 -06:00
Nicole Thomas
0fcdb324c6
Merge pull request #24081 from jacobhammons/develop
...
added custom search for each branch, fixed style issues
2015-05-22 17:04:17 -06:00
Nicole Thomas
8e04db76de
Merge pull request #24090 from jfindlay/merge_24062
...
adding states/mount unit test case
2015-05-22 17:02:57 -06:00
Michael Steed
41b344c7d3
Make LocalClient.cmd_iter_no_block() not block
...
Add an optional 'block' parameter to LocalClient.get_iter_returns().
Pass block=False in cmd_iter_no_block() so it can yield when no returns
are available. Fixes #23464
2015-05-22 16:38:16 -06:00
rallytime
7146871d73
Revert "Remove key management test from digital ocean cloud tests"
...
This reverts commit 1d031caa78
2015-05-22 15:33:40 -06:00
Justin Findlay
c0079f5dc7
Merge pull request #24086 from rallytime/bp-22806
...
Backport #22806 to 2015.5
2015-05-22 15:18:20 -06:00
Nicole Thomas
8d940af074
Merge pull request #24087 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-05-22 15:13:00 -06:00
Jayesh Kariya
a81a9225b8
adding states/mount unit test case
2015-05-22 14:56:56 -06:00
Justin Findlay
09de253373
Merge pull request #24024 from jayeshka/mongodb_user-states-unit-test
...
adding states/mongodb_user unit test case
2015-05-22 14:53:19 -06:00
Justin Findlay
5eb97f0973
if a charmap is not supplied, set it to the codeset
...
Fixes #23221 .
2015-05-22 14:48:39 -06:00
Justin Findlay
b2259a6370
allow override of binary file mode on windows
...
Related to #24052 .
2015-05-22 14:27:29 -06:00
Justin Findlay
c3744ef0db
Merge pull request #24083 from swdream/swedream_Fix_code_block_syntax
...
fix code block syntax
2015-05-22 13:56:17 -06:00
Justin Findlay
739b2ef3bd
rework yumpkg refresh_db so args are not mandatory
2015-05-22 13:49:50 -06:00
Colton Myers
4b7ef52736
Use six.string_types
2015-05-22 13:04:57 -06:00
Colton Myers
d7362bb5dd
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/states/file.py
salt/utils/event.py
2015-05-22 13:02:54 -06:00
Colton Myers
bfd812c56b
Merge pull request #24065 from makinacorpus/real23883
...
continue to fix #23883
2015-05-22 12:59:21 -06:00
Justin Findlay
f728f55160
use cmd.run_all instead of cmd.run_stdout
...
Fixes #22574 .
2015-05-22 12:58:41 -06:00
thanhnt
01b546e6e8
fix code block syntax
2015-05-23 00:57:42 +07:00
Jacob Hammons
1e1eb2b3ea
added custom search for each branch, fixed style issues
2015-05-22 11:53:33 -06:00
Mathieu Le Marec - Pasquet
028282e01d
continue to fix #23883
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-22 19:42:30 +02:00
Justin Findlay
e85f80a131
Revert "Fix for https://github.com/saltstack/salt/issues/23221 "
2015-05-22 11:10:41 -06:00
Thomas S Hatch
55732ab260
Merge pull request #24061 from diego-XA/develop
...
Fix for https://github.com/saltstack/salt/issues/23221
2015-05-22 10:57:55 -06:00
Nicole Thomas
d5b5fc16c7
Merge pull request #24072 from rallytime/merge-24055
...
Merge #24055 with version added tags
2015-05-22 10:57:29 -06:00
Thomas S Hatch
273b0b15fc
Merge pull request #24055 from mgwilliams/boto
...
add zone management funcs to boto_route53
2015-05-22 10:57:21 -06:00
Thomas S Hatch
4d51b5781b
Merge pull request #24053 from gladiatr72/sqlite_que__adjust_quoting_take2
...
Sqlite que adjust quoting take2
2015-05-22 10:57:07 -06:00
Thomas S Hatch
429adfe00a
Merge pull request #24029 from makinacorpus/fixproviders
...
Fix providers handling
2015-05-22 10:56:06 -06:00
