Ronald van Zantvoort
34646eae16
thin_gen breaks when thinver doesn't exist
...
If the thinver file doesn't exist (and I don't know why it didn't exist yet, might be because this was the first go @salt-ssh, might be some overzealous `rm -rf /var/cache/salt/`), `thin_gen` borks because it tries to open the file before checking whether or not it exists.
2015-05-25 14:58:32 +02:00
Justin Findlay
ec509ed272
Merge pull request #24108 from jayeshka/mysql_query-states-unit-test
...
adding states/mysql_query unit test case
2015-05-25 06:30:48 -06:00
Justin Findlay
f2e5d6c2fd
Merge pull request #24110 from jayeshka/varnish-unit-test
...
adding varnish unit test case
2015-05-25 06:30:21 -06:00
Justin Findlay
4fca2b49e3
Merge pull request #24109 from jayeshka/mysql_grants-states-unit-test
...
adding states/mysql_grants unit test case
2015-05-25 06:29:53 -06:00
Jayesh Kariya
e11988969f
adding varnish unit test case
2015-05-25 16:01:02 +05:30
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
nleib
15f24b42b2
update format of string in disabled msg
2015-05-24 11:27:31 +03: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
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
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
Justin Findlay
c0079f5dc7
Merge pull request #24086 from rallytime/bp-22806
...
Backport #22806 to 2015.5
2015-05-22 15:18:20 -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
739b2ef3bd
rework yumpkg refresh_db so args are not mandatory
2015-05-22 13:49:50 -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
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
Thomas S Hatch
429adfe00a
Merge pull request #24029 from makinacorpus/fixproviders
...
Fix providers handling
2015-05-22 10:56:06 -06:00
Andreas Lutro
7790408c3c
Change how state_verbose output is filtered
...
Previously, a successful state that made no changes would not be added to the
count of successful states if `state_verbose` is set to `True`, because the
successful states with no changes made are filtered out before they are being
iterated over.
By moving the logic that filters states into the loop, after the code that has
incremented the number of successful/changed states, the count will be correct
while the output is still suppressed.
Fixes #24009
2015-05-22 18:36:08 +02:00
Thomas S Hatch
a42ccccd98
Merge pull request #23936 from jfindlay/file_state
...
remove unreachable returns in file state
2015-05-22 10:26:49 -06:00
Nicole Thomas
8b69b41a42
Merge pull request #24063 from jayeshka/mount-states-module
...
removed tuple index error
2015-05-22 08:58:20 -06:00
Jayesh Kariya
b9745d5c4f
removed tuple index error
2015-05-22 16:56:33 +05:30
Justin Findlay
02ac4aa288
Merge pull request #24057 from rallytime/bp-22572
...
Backport #22572 to 2015.5
2015-05-21 23:36:25 -06:00
Jayesh Kariya
f31dc921f5
resolved errors
2015-05-22 10:48:28 +05:30
Ronald van Zantvoort
49aad84b17
Small docfix for GitPillar
2015-05-21 20:36:39 -06:00
Justin Findlay
82de059891
Merge pull request #24040 from rallytime/bp-24027
...
Backport #24027 to 2015.5
2015-05-21 17:43:54 -06:00
Justin Findlay
d909781d97
Merge pull request #24039 from rallytime/bp-24015
...
Backport #24015 to 2015.5
2015-05-21 17:43:25 -06:00
Justin Findlay
4a0f254d22
Merge pull request #24038 from rallytime/bp-19599
...
Backport #19599 to 2015.5
2015-05-21 17:43:10 -06:00
Nicole Thomas
42b87f1049
Merge pull request #24046 from rallytime/remove_key_test
...
Remove key management test from digital ocean cloud tests
2015-05-21 16:32:04 -06:00
Nicole Thomas
eff54b1c5a
Merge pull request #24044 from cro/pgjsonb
...
Remove spurious log message, fix typo in doc
2015-05-21 16:31:49 -06:00
Nicole Thomas
ac32000b5d
Merge pull request #24001 from msteed/issue-23883
...
issue #23883
2015-05-21 14:32:30 -06:00
rallytime
1d031caa78
Remove key management test from digital ocean cloud tests
...
The create_key function was added to develop, but isn't present in 2015.5.
2015-05-21 13:37:34 -06:00
C. R. Oldham
de0663314a
Remove spurious log message, fix typo in doc
2015-05-21 13:26:30 -06:00
Colton Myers
f7fae26059
Merge pull request #23995 from makinacorpus/lxc_path_pre
...
Lxc path pre
2015-05-21 11:26:03 -06:00
Wout Maaskant
37d25d8bc6
Added baseurl as alias for url and mirrorlist in salt.modules.zypper.mod_repo.
2015-05-21 11:09:48 -06:00
YanChii
6bfaa94a8c
minor improovement of solarisips docs & fix typos
2015-05-21 11:06:51 -06:00
Justin Findlay
26d6851666
Merge pull request #24032 from kartiksubbarao/augeas_insert_16383
...
Update augeas_cfg.py
2015-05-21 11:03:42 -06:00
Daniel Fayette
ea00d3e786
Fix ssh_auth test mode, compare lines not just key
...
Intened to fix #19598
2015-05-21 10:55:14 -06:00
