Commit Graph

53925 Commits

Author SHA1 Message Date
Thomas S Hatch
5488c4aaa2 Merge pull request #23928 from joejulian/2015.5_tls_module_replace_existing
Add the ability to replace existing certificates
2015-05-25 13:47:26 -06:00
Thomas S Hatch
be701f9eb1 Merge pull request #23937 from jfindlay/depr_file_func
replace file.contains_regex_multiline with file.search
2015-05-25 13:47:05 -06:00
Thomas S Hatch
554f3272c5 Merge pull request #24075 from DSRCompany/raet_bufcnt_conf
Add config options for raet network buffers count
2015-05-25 13:46:05 -06:00
Thomas S Hatch
f76622ad67 Merge pull request #24076 from garethgreenaway/refactoring_schedule_module
Refactoring schedule module
2015-05-25 13:45:50 -06:00
Thomas S Hatch
dd90ef09b9 Merge pull request #24078 from jfindlay/locale_charmap
if a charmap is not supplied, set it to the codeset
2015-05-25 13:39:19 -06:00
Thomas S Hatch
9cec5d3dc9 Merge pull request #24088 from jfindlay/pkg_tests
pkg module integration tests
2015-05-25 13:39:02 -06:00
Thomas S Hatch
517552caa6 Merge pull request #24089 from jfindlay/binary_write
allow override of binary file mode on windows
2015-05-25 13:38:44 -06:00
Thomas S Hatch
121ab9f857 Merge pull request #24092 from jfindlay/file_state
collect scattered contents edits, ensure it's a str
2015-05-25 13:38:10 -06:00
Thomas S Hatch
84e65dece7 Merge pull request #24112 from The-Loeki/patch-1
thin_gen breaks when thinver doesn't exist
2015-05-25 13:37:47 -06:00
Thomas S Hatch
b7e68a5d8b Merge pull request #24118 from trevor-h/fix-extpillar-mongo
removed deprecated pymongo usage
2015-05-25 13:37:17 -06:00
Justin Findlay
bb57880077 Merge pull request #24116 from awdrius/develop
Fixed typo in chown username (ending dot) that fails the command.
2015-05-25 12:20:26 -06:00
Trevor Hammond
d8b8f6c2c3 removed deprecated pymongo usage as no longer functional with pymongo > 3.x 2015-05-25 13:45:52 -04:00
Audrius Sadauskas
e33337c209 Fixed typo in chown username (ending dot) that fails the command. 2015-05-25 17:35:52 +01:00
Nicole Thomas
39a8f30f06 Merge pull request #24093 from msteed/issue-23464
Make LocalClient.cmd_iter_no_block() not block
2015-05-25 09:56:41 -06:00
Nicole Thomas
4f080e3577 Merge pull request #24014 from ticosax/dockerng-enforce-env-string
[dockerng] Enforce environment values to be strings.
2015-05-25 09:43:58 -06:00
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
Justin Findlay
81e03e9a1c Merge pull request #24105 from cedwards/beacon_docs
Updated some beacon-specific documentation formatting
2015-05-25 06:29:30 -06:00
Joseph Hall
d75dca405d Merge pull request #24104 from pruiz/fix-23364
Only try to stop a VM if it's not already stopped. (fixes #23364)
2015-05-25 05:49:49 -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
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
Mathieu Le Marec - Pasquet
2931df00fc lint
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-25 01:20:29 +02:00
Mathieu Le Marec - Pasquet
3dae4ca1f8 parsers: fix --enable-profiling option
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-24 16:47:15 +02:00
Mathieu Le Marec - Pasquet
d07949d23b Gate cProfile
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-24 16:44:10 +02:00
Mathieu Le Marec - Pasquet
12734be0e9 Support for profiling in salt-run
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-24 16:44:10 +02:00
Mathieu Le Marec - Pasquet
96b759300a Salt call profiling support
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-24 16:44:10 +02:00
Mathieu Le Marec - Pasquet
6b01973b86 test.rand_str: better kwargs handling 2015-05-24 16:44:10 +02:00
Mathieu Le Marec - Pasquet
1b8e0d0483 Refactor test.rand_str to reuse later
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-24 16:17:38 +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