Joseph Hall
467ba64612
Make sure that minion IDs are strings
2015-05-26 15:09:34 -06:00
Justin Findlay
51c3cec5d7
Merge pull request #24146 from rallytime/fix_centos_boto_failure
...
Fixes the boto_vpc_test failure on CentOS 5 tests
2015-05-26 14:15:19 -06:00
C. R. Oldham
1c91a2176f
Merge pull request #24144 from twangboy/fix_24052
...
Compare Keys ignores all newlines and carriage returns
2015-05-26 13:25:48 -06:00
rallytime
ac0f97de51
Fixes the boto_vpc_test failure on CentOS 5 tests
...
pkg_resources.get_distribution doesn't work on CentOS 5 since it looks
for moto in site-packages and not pip (which is how we're installing it
in the salt-jenkins states).
This catches the exception through by get_distribution so we can run the
rest of the tests in this file.
2015-05-26 12:25:51 -06:00
Justin Findlay
084166747c
Merge pull request #24139 from rallytime/bp-24118
...
Backport #24118 to 2015.5
2015-05-26 12:24:27 -06:00
Justin Findlay
742eca29f7
Merge pull request #24138 from rallytime/bp-24116
...
Backport #24116 to 2015.5
2015-05-26 12:23:51 -06:00
Justin Findlay
e01536d098
Merge pull request #24137 from rallytime/bp-24105
...
Backport #24105 to 2015.5
2015-05-26 12:23:39 -06:00
twangboy
c197b41494
Compare Keys removing all newlines and carriage returns
2015-05-26 17:34:14 +00:00
Justin Findlay
89cdf976e1
Merge pull request #24136 from rallytime/bp-24104
...
Backport #24104 to 2015.5
2015-05-26 09:58:47 -06:00
Justin Findlay
67c4373577
Merge pull request #24135 from rallytime/bp-24083
...
Backport #24083 to 2015.5
2015-05-26 09:58:27 -06:00
Justin Findlay
a83371e0ed
Merge pull request #24131 from jayeshka/mysql_user-states-unit-test
...
adding states/mysql_user unit test case
2015-05-26 09:58:10 -06:00
Justin Findlay
1dc1d2a6e5
Merge pull request #24130 from jayeshka/ntp-states-unit-test
...
adding states/ntp unit test case
2015-05-26 09:57:29 -06:00
Justin Findlay
39434179a8
Merge pull request #24128 from jayeshka/openstack_config-states-unit-test
...
adding states/openstack_config unit test case
2015-05-26 09:56:07 -06:00
Justin Findlay
23f25c4298
Merge pull request #24127 from jayeshka/npm-states-unit-test
...
adding states/npm unit test case
2015-05-26 09:55:18 -06:00
Thomas S Hatch
07488a4415
Merge pull request #24077 from alprs/fix-outputter_highstate_nonverbose_count
...
Change how state_verbose output is filtered
2015-05-26 09:41:11 -06:00
Nicole Thomas
224820febf
Merge pull request #24119 from jfindlay/update_contrib_docs
...
Update contrib docs
2015-05-26 09:37:01 -06:00
Trevor Hammond
4bb519b8da
removed deprecated pymongo usage as no longer functional with pymongo > 3.x
2015-05-26 09:25:10 -06:00
Audrius Sadauskas
7f08641800
Fixed typo in chown username (ending dot) that fails the command.
2015-05-26 09:23:42 -06:00
Christer Edwards
f0778a0a60
Updated some beacon-specific documentation formatting
2015-05-26 09:21:37 -06:00
Pablo Ruiz
c53888415f
Only try to stop a VM if it's not already stopped. ( fixes #23364 )
2015-05-26 08:59:22 -06:00
thanhnt
e1d06f9764
fix code block syntax
2015-05-26 08:57:46 -06:00
Jayesh Kariya
ca09e0f7c1
adding states/openstack_config unit test case
2015-05-26 15:28:14 +05:30
Jayesh Kariya
ede4a9f2f1
adding states/ntp unit test case
2015-05-26 15:26:50 +05:30
Jayesh Kariya
c3ecabbae0
adding states/npm unit test case
2015-05-26 15:25:59 +05:30
Jayesh Kariya
ed1ef69856
adding states/mysql_user unit test case
2015-05-26 15:24:43 +05:30
Justin Findlay
fa2d411f53
update example release branch in contrib docs
2015-05-25 23:06:39 -06:00
Justin Findlay
a0b76b57b3
clarify git rebase instructions
2015-05-25 23:05:23 -06:00
Justin Findlay
3517e0095f
fix contribution docs link typos
2015-05-25 22:55:19 -06:00
Justin Findlay
651629c6a4
backport dev contrib doc updates to 2015.5
2015-05-25 22:54:54 -06:00
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
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
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
nleib
7690e5b008
remove trailing whitespaces
2015-05-23 17:44:34 +03:00
