valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,467 Commits 24 Branches 182 Tags 341 MiB
9f88f11ccd
Commit Graph

57467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
9f88f11ccd Add versionadded directives for #26312 2015-08-17 11:43:13 -06:00
Nicole Thomas
a870b79748 Merge pull request #26312 from fictivekin/vpc_name_in_secgroup 
allow vpc_name instead of vpc_id for boto_secgroup
 2015-08-17 11:39:41 -06:00
Joseph Hall
8b525116fc Merge pull request #26357 from codehotter/call-action-on-instance-id 
Not ready for merge! Call action on instance-id
 2015-08-17 10:33:57 -06:00
Justin Findlay
4bf5c28efa Merge pull request #26377 from jagguli/develop 
Avoid key error if 'Status' is not present in container info.
 2015-08-17 09:00:22 -06:00
Justin Findlay
3ae37cdc21 Merge pull request #26376 from TheBigBear/patch-7 
minor edit spelling
 2015-08-17 08:59:35 -06:00
Justin Findlay
d239ba6cf6 Merge pull request #26373 from TheBigBear/patch-6 
Fix shell quoting for cmd.run in win_pkg.py
 2015-08-17 08:46:56 -06:00
Justin Findlay
2201809ce7 Merge pull request #26367 from gtmanfred/develop 
use the same quotes as the join
 2015-08-17 08:43:27 -06:00
Justin Findlay
d47c71352e Merge pull request #26353 from sixninetynine/develop 
fixed a typo in setup.py
 2015-08-17 08:28:08 -06:00
Justin Findlay
ad34921ae7 Merge pull request #26344 from hs-calc/patch-1 
Adds antix to _OS_FAMILY_MAP in grains/core.py
 2015-08-17 08:25:58 -06:00
Steven Joseph
1199218bec Avoid key error if 'Status' is not present in container info. 
- assumes container is not running if 'Status' not present
 2015-08-17 22:35:50 +10:00
TheBigBear
f9d2664def minor edit 2015-08-17 13:23:46 +01:00
TheBigBear
2c949494ed Update win_pkg.py 2015-08-17 12:35:35 +01:00
TheBigBear
3ffa1609a4 Fix shell quoting for cmd.run 
In my tests this fixed issue https://github.com/saltstack/salt/issues/26114 , maybe somebody needs to test for regressions?
 2015-08-17 11:40:22 +01:00
Daniel Wallace
38f72e5ce7 use the same quotes as the join 2015-08-16 20:13:26 -05:00
Emanuel Rietveld
d4e6a17ea2 Allow calling an action on instance-id, passing the instance-id to driver as name 2015-08-16 13:03:32 +02:00
Emanuel Rietveld
25771fc030 _get_node return instance info directly, not a dict of instances 2015-08-16 13:02:39 +02:00
Loren Carvalho
4afc820fd5 fixed Packaing -> Packaging typo and added a couple comments on the setuptools/distutils abstract methods 2015-08-15 21:04:51 -07:00
Sean Coates
1ede9dbca0 add docstring to satisfy jenkins 2015-08-15 12:51:43 -04:00
hs-calc
4dfb1dd8e4 Adds antix to _OS_FAMILY_MAP in grains/core.py 2015-08-15 12:00:42 +02:00
Erik Johnson
c34c6b992f Merge pull request #26333 from gtmanfred/develop 
Add some redis sentinel and cluster support
 2015-08-15 00:31:19 -05:00
Sean Coates
756754ae42 remove now-unused imports; thanks Jenkins. 2015-08-14 20:15:08 -04:00
Sean Coates
5dd4538835 default to None params on check_vpc to make it more easily exposed to other modules/states 2015-08-14 19:32:10 -04:00
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
Daniel Wallace
3a08d55ff5 fix linting errors 2015-08-14 15:46:29 -05: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
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
Sean Coates
7218a4fc56 remove debuggery 2015-08-14 10:00:38 -04: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
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
Nicole Thomas
317c7d8f5d Merge pull request #26281 from loa/add-loa-developers 
Add loa to developers
 2015-08-13 09:38:04 -06: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
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
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
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
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