Jerzy Drozdz
ded5002f41
Return values fixes
2015-05-30 01:04:32 +02:00
Jerzy Drozdz
9eb9892516
Changed return values and assertions to lists
2015-05-30 01:03:43 +02:00
Jerzy Drozdz
e564a0b473
Added setting of __grains__['osrelease'] in test
2015-05-30 00:16:25 +02:00
Jerzy Drozdz
15ef09504e
FIX: pylint errors
2015-05-29 22:50:29 +02:00
Jerzy Drozdz
8775906709
Merge remote-tracking branch 'upstream/develop' into develop
2015-05-29 12:28:22 +02:00
Jerzy Drozdz
6a167d91d0
IPv6 routes support for RedHat Linux
2015-05-29 11:55:50 +02:00
Nicole Thomas
1b306c5849
Merge pull request #24221 from rallytime/fix_python26_boto_util_error
...
Add SyntaxError to get_error exception
2015-05-28 21:10:00 -06:00
Nicole Thomas
decb2861de
Merge pull request #24220 from djcrabhat/develop
...
adding key_filename param to vsphere provider
2015-05-28 21:06:58 -06:00
rallytime
1f8190b6be
Add SyntaxError to get_error exception
...
Python2.6 throws a SyntaxError here instead of an AttributeError like Python 2.7 does
2015-05-28 14:33:30 -06:00
Manoli Yiannakakis
bed2af7c84
adding key_filename param to vsphere provider
2015-05-28 13:18:12 -07:00
Justin Findlay
4e61c4312a
Merge pull request #24218 from jimjh/add-delete-policies
...
Add a `delete_policies` argument to `boto_iam_role.present`
2015-05-28 14:15:12 -06:00
J. Lim
da93f8566c
add delete_policies arg
2015-05-28 11:49:15 -07:00
Nicole Thomas
ea413bcb83
Merge pull request #24205 from hazelesque/20150528-yumpkg-hold-docstring-fix
...
Docstring fix in salt.modules.yumpkg.hold
2015-05-28 08:37:07 -06:00
Hazel
72a5399932
Docstring fix in salt.modules.yumpkg.hold
...
Docstring fix: s/deleted/held/ in salt.modules.yumpkg.hold
2015-05-28 10:58:33 +01:00
Jerzy Drozdz
03c32e40b7
.gitignore update
2015-05-28 00:40:31 +02:00
Nicole Thomas
561d7b72bb
Merge pull request #24187 from DSRCompany/postinitio_rename
...
Changed the now deprecated .postinitio to ._prepare
2015-05-27 16:12:46 -06:00
Nicole Thomas
fd41993022
Merge pull request #24157 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-05-27 16:09:00 -06:00
Jerzy Drozdz
1d30f32540
Added new RH route template for RHEL6 and newer
2015-05-28 00:02:53 +02:00
Colton Myers
116b88dac3
Fix mocking in file state unit tests
2015-05-27 14:55:34 -06:00
Nicole Thomas
42d4244e3c
Merge pull request #24186 from thcipriani/develop
...
Update salt vagrant provisioner info
2015-05-27 13:31:30 -06:00
Colton Myers
90e557ca90
join_locale is now in salt.utils.locales
2015-05-27 13:08:42 -06:00
Colton Myers
9dab9a1dda
Fix python3 lint
2015-05-27 13:07:47 -06:00
Dmitry Kuzmenko
b8c0d1782c
Changed the now deprecated .postinitio to ._prepare
2015-05-27 21:28:08 +03:00
Tyler Cipriani
8ec82b640d
Update salt vagrant provisioner info
...
Also tweaked one piece of confusing verbiage
2015-05-27 11:13:29 -07:00
Thomas S Hatch
a21dbe4a58
Merge pull request #24152 from dougluce/npm-allow-url-specification
...
Allow URL specification of NPM packages
2015-05-27 10:22:06 -06:00
Thomas S Hatch
5437898a1b
Merge pull request #24155 from techhat/returnedjobs
...
Let lookup_jid show only missing minions
2015-05-27 10:21:39 -06:00
Nicole Thomas
987aeb1c17
Merge pull request #24173 from techhat/cookieerr
...
Better error and cookie handling
2015-05-27 09:57:24 -06:00
Nicole Thomas
417f4e7192
Merge pull request #24170 from Precis/fix-pillar-signing-policy
...
Signing policy lookup in pillar.
2015-05-27 09:16:54 -06:00
Joseph Hall
3e22888f15
Linting
2015-05-27 08:52:39 -06:00
Joseph Hall
4c66a9b68b
Better error and cookie handling
2015-05-27 08:07:43 -06:00
Matthias Erll
45f93c69a1
Added signing policy lookup in pillar.
2015-05-27 12:46:59 +02:00
Doug Luce
2e36b8a73f
Fix indentation.
2015-05-27 02:08:35 -07:00
Nicole Thomas
555cdc95de
Merge pull request #24143 from terminalmage/docker-exec
...
Drop default use of docker-exec in dockerng
2015-05-26 17:18:58 -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
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
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
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
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
