Colton Myers
9dab9a1dda
Fix python3 lint
2015-05-27 13:07:47 -06:00
Colton Myers
60f2e9eefb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/development/contributing.rst
salt/modules/tls.py
2015-05-26 16:38:42 -06:00
Colton Myers
70247890de
Merge pull request #24123 from makinacorpus/ss
...
fix service enable/disable change
2015-05-26 15:24:19 -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
Nicole Thomas
75a2239f67
Merge pull request #24129 from pengyao/wheel_client_doc
...
Wheel client doc
2015-05-26 09:48:40 -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
pengyao
6b88772e28
fixed a typo
2015-05-26 17:57:30 +08:00
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
pengyao
dff2731249
Add cmd doc for WheelClient
2015-05-26 17:51:34 +08:00
Mathieu Le Marec - Pasquet
2e2e1d262d
fix service enable/disable change
...
This fixes #24122
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-26 11:22:13 +02:00
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
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
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
