Sean Coates
742a10536b
refactor to expose boto_vpc.check_vpc and DRY
2015-08-14 19:15:53 -04:00
Daniel Wallace
b66bbbef1e
original pylint lied to me
2015-08-14 16:50:27 -05:00
Justin Findlay
2184ac1f81
Merge pull request #26331 from mnalt/fix_sysrc_empty_variables
...
fix bug in sysrc to allow for empty rc variables
2015-08-14 15:21:13 -06:00
Daniel Wallace
3a08d55ff5
fix linting errors
2015-08-14 15:46:29 -05:00
C. R. Oldham
aeb1b0eac7
Merge pull request #26334 from rallytime/fix-26310
...
Call salt.utils.cloud.bootstrap in GCE Driver provisioning
2015-08-14 13:39:32 -06:00
rallytime
78c8468c54
Return full information of VM creation
2015-08-14 12:54:16 -06:00
rallytime
6ae7524744
Call salt.utils.cloud.bootstrap in GCE Driver provisioning
...
Fixes #26310
2015-08-14 12:44:09 -06:00
Daniel Wallace
5bdcf9d72a
add version
2015-08-14 13:33:23 -05:00
Daniel Wallace
1a08bba479
add engine to monitor redis sentinel pubsub
2015-08-14 13:31:41 -05:00
Daniel Wallace
d967505ea9
add setting the slave of a specified master on a sentinel
2015-08-14 13:30:26 -05:00
Daniel Wallace
851d34a6a5
add cluster information for redis
2015-08-14 13:30:26 -05:00
Martin Alt
6c5f0e6b9e
fix bug in sysrc to allow for empty rc variables
...
/etc/defaults/rc.conf containes empty variables, e.g. cloned_interfaces.
sysrc will return something like
'cloned_interfaces: '
such empty variables would raise an exception. Fixed by checking for
empty variables.
2015-08-14 19:11:39 +02:00
Sean Coates
11cec70bc4
account for non-VPC branch; fixes tests
2015-08-14 12:07:12 -04:00
Nicole Thomas
be10f2c7a3
Merge pull request #26267 from fictivekin/avoid_rate_limit_boto_route53
...
Allow (and default to) retries when Route53 changes are throttled by the AWS API
2015-08-14 09:53:19 -06:00
Justin Anderson
81377ec710
Merge pull request #26308 from dmurphy18/dgm_envfix
...
Support for environment overrides building packages
2015-08-14 09:13:00 -06:00
Sean Coates
7218a4fc56
remove debuggery
2015-08-14 10:00:38 -04:00
Evgeny Vereshchagin
ecb6b7d40f
Fix service.enable for masked services
2015-08-14 13:09:20 +00:00
Sean Coates
0b8600a591
allow vpc_name instead of vpc_id for boto_secgroup
2015-08-13 21:53:57 -04:00
Sean Coates
861e31a110
as requested, fix the style errors at https://jenkins.saltstack.com/job/salt-pr-lint-n/8272/violations/file/salt/modules/boto_route53.py/
2015-08-13 19:38:37 -04:00
David Murphy
823db50f95
Support for environment overrides building packages
2015-08-13 16:56:53 -06:00
Joseph Hall
40b7c3c393
Linting
2015-08-13 13:30:49 -06:00
Joseph Hall
ecb63194c9
Linting
2015-08-13 12:58:43 -06:00
Gareth J. Greenaway
ac36c3e979
Two more fixes to unit tests reflecting changes.
2015-08-13 10:53:37 -07:00
Mike Place
909556ad26
Merge pull request #26282 from silenius/pw_group
...
add adduser and deluser to pw_group
2015-08-13 10:37:51 -06:00
Joseph Hall
bde90dcc2c
Add versionadded strings
2015-08-13 10:31:13 -06:00
Joseph Hall
bbc476458c
Break out SPM components into loaders
2015-08-13 10:15:47 -06:00
Nicole Thomas
317c7d8f5d
Merge pull request #26281 from loa/add-loa-developers
...
Add loa to developers
2015-08-13 09:38:04 -06:00
Gareth J. Greenaway
22ac074f5d
Additional changes to ensure unit tests pass.
2015-08-13 08:21:09 -07:00
Julien Cigar
37703059d4
add adduser and deluser to pw_group
2015-08-13 13:03:36 +02:00
Carl Loa Odin
b60d8a9ebb
Add loa to developers
2015-08-13 11:27:13 +02:00
Seth House
c60452715b
Merge pull request #26279 from TheScriptSage/add-api-acl
...
Merge changes for pull#26083 and pull#25632 into 2015.8
2015-08-12 20:50:37 -06:00
Robert Davis
4e1d978b2f
Merge changes for pull#26083 and pull#25632 into 2015.8
2015-08-12 17:45:02 -07:00
Gareth J. Greenaway
89576e870f
Updating unit tests to reflect changes to schedule module.
2015-08-12 17:44:37 -07:00
Gareth J. Greenaway
1e5625e5a9
Jobs are enabled by default but schedule.list does not show an enabled jobs as being enabled by default. This change fixes that. Also allows schedule.list to be able to filter out disabled jobs.
2015-08-12 14:01:40 -07:00
Justin Findlay
4cf9a16e63
Merge pull request #26224 from cachedout/fopen_2015_8
...
Cleanup of a few cases to move to salt.utils.fopen
2015-08-12 14:15:49 -06:00
C. R. Oldham
6b109be018
Merge pull request #26262 from cro/20158-develop-mf
...
Merge 2015.8 forward to develop (get ldap fix)
2015-08-12 13:51:39 -06:00
Sean Coates
394c6655e9
allow (and default to) retries when throttled by the AWS API
2015-08-12 15:39:44 -04:00
Nicole Thomas
ba15691abb
Merge pull request #26260 from nmadhok/doc-fix-2015.8
...
Correct spelling of integration in docs
2015-08-12 12:14:30 -06:00
Nicole Thomas
8745542d09
Merge pull request #26259 from nmadhok/doc-fix-develop
...
Correct spelling of integration in docs
2015-08-12 12:14:14 -06:00
Mike Place
35d6ae2be7
Use with
2015-08-12 12:14:12 -06:00
Mike Place
5728a170a5
Merge pull request #26231 from garethgreenaway/adding_gpg_state
...
Fixing trust_key in gpg module, adding GPG state.
2015-08-12 11:58:29 -06:00
C. R. Oldham
7fc3232633
Merge 2015.8 forward to develop (get ldap fix)
2015-08-12 11:37:04 -06:00
Nitin Madhok
264f3bf656
Correct spelling of integration in docs
2015-08-12 13:27:30 -04:00
Nitin Madhok
ea738f0d2d
Correct spelling of integration in docs
2015-08-12 13:23:26 -04:00
Thomas S Hatch
7c501f8a7b
Merge pull request #26226 from rallytime/fix-25463
...
Fix #25463
2015-08-12 11:04:11 -06:00
Nicole Thomas
8281a2da5f
Merge pull request #26249 from nmadhok/vmware-cloud-test-develop
...
Initial commit of unit tests for vmware cloud driver
2015-08-12 11:00:00 -06:00
Nicole Thomas
6730990bbc
Merge pull request #26248 from nmadhok/vmware-cloud-test-2015.8
...
Initial commit of unit tests for vmware cloud driver
2015-08-12 10:59:15 -06:00
Colton Myers
47f56a7db7
Merge pull request #26228 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-12 10:16:06 -06:00
Colton Myers
1c661abc91
Skip failing event tests
...
@driskell it would be great if you could fix these up when you do your
2015.8 refactor
2015-08-12 10:15:11 -06:00
rallytime
71f1c3fd34
Provide a more accurate error message.
2015-08-12 09:26:53 -06:00
