Christer Edwards
e57f29b1eb
addressing more lint issues
2015-05-26 16:29:53 -06:00
Colton Myers
e52b5ab2e2
Remove stray >>>>>
2015-05-26 15:51:56 -06:00
Colton Myers
7dfbd929ff
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-05-26 15:51:15 -06:00
Joseph Hall
6655831048
Let lookup_jid show only missing minions
2015-05-26 15:25:59 -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
Joseph Hall
467ba64612
Make sure that minion IDs are strings
2015-05-26 15:09:34 -06:00
Doug Luce
6fe47ea1f4
Allow URL specification of NPM packages
...
If an NPM package was specified as a
url (i.e. git://github.com/Unitech/pm2), the state would crash with an
IndexError. Assume that not every package installed globally is
specified with a URL.
Example failing state:
kvsio:
npm.installed:
- name: git+ssh://github.com/dougluce/kvs.io.git
2015-05-26 13:19:17 -07: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
Justin Findlay
cc5e17e61f
attempt to decode win update package
...
Fixes #24102 .
2015-05-26 12:00:23 -06:00
Erik Johnson
cce85d0cf8
Lint fixes
2015-05-26 12:58:43 -05:00
twangboy
c197b41494
Compare Keys removing all newlines and carriage returns
2015-05-26 17:34:14 +00:00
Erik Johnson
13fa7e6844
Drop default use of docker-exec in dockerng
...
See https://groups.google.com/forum/#!topic/salt-users/i6Eq4rf5ml0 for
background on this.
2015-05-26 12:16:26 -05:00
Colton Myers
9ef2c64098
Add docstring
2015-05-26 10:46:58 -06:00
Colton Myers
8579429314
Add in recursive_update from #24097
2015-05-26 10:46:19 -06:00
Colton Myers
8599143200
if key not in dest, don't recurse
2015-05-26 10:41:27 -06:00
Colton Myers
d8a84b3017
Rename klass to valtype
2015-05-26 10:40:37 -06: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
Thomas S Hatch
c0d32e0b5e
Merge pull request #24125 from hvnsweeting/fix-rabbitmq-test-mode
...
Fix rabbitmq test mode
2015-05-26 09:40:18 -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
Viet Hung Nguyen
71862c69b9
enhance log
2015-05-26 16:04:53 +07:00
Viet Hung Nguyen
28e2594162
change according to new output of rabbitmq module functions
2015-05-26 15:57:59 +07:00
Viet Hung Nguyen
cd0212e8ed
processes and returns better output for rabbitmq module
...
- also: fix test mode of rabbitmq_user
2015-05-26 15:57:59 +07: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
