valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,517 Commits 24 Branches 182 Tags 341 MiB
2c72bd8924
Commit Graph

55517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rafael Uzarowski
2c72bd8924 Add ability to attach an existing eni 2015-07-10 10:38:31 +02:00
Thomas S Hatch
4eb62e322d Merge pull request #25283 from jfindlay/win_user 
ensure ret is always defined
 2015-07-09 19:29:24 -06:00
Thomas S Hatch
a2860cb7a9 Merge pull request #25252 from jfindlay/win_fire 
make args optional with default values in win_firewall.delete_rule
 2015-07-09 19:27:50 -06:00
jacobhammons
cd405b440e Merge pull request #25257 from notpeter/SourceDestCheck 
Document SourceDestCheck added in #25242.
 2015-07-09 17:29:48 -06:00
Shane Lee
fb717d37f2 Merge pull request #25298 from twangboy/fix_25275 
Continue if profile not found
 2015-07-09 16:38:32 -06:00
Shane Lee
0a7ec11212 Merge pull request #25296 from twangboy/fix_25294 
Fixed file.comment for windows
 2015-07-09 15:08:02 -06:00
twangboy
0e29607e2c More lint (removed import os) 2015-07-09 15:06:48 -06:00
C. R. Oldham
58ca83cda1 Merge pull request #25254 from rallytime/change_beryllium_refs 
Change versionadded/changed references from Beryllium to 2015.8.0
 2015-07-09 15:01:15 -06:00
twangboy
dc00492dec Fixed some lint 2015-07-09 11:54:15 -06:00
twangboy
b4380c0838 Fixed some lint 2015-07-09 11:52:35 -06:00
twangboy
b71695ab9b Continue if profile not found 2015-07-09 11:43:42 -06:00
twangboy
d726bb49e0 Fixed file.comment for windows 2015-07-09 09:53:56 -06:00
Justin Findlay
fa13f3e1ed Merge pull request #25285 from thusoy/patch-3 
Remove error logging of missing victorops keys
 2015-07-09 09:10:47 -06:00
Nicole Thomas
06347f3900 Merge pull request #25266 from ruzarowski/2015.8-SourceDestCheck 
cloud: EC2 eni property SourceDestCheck is a AttributeBooleanValue
 2015-07-09 07:29:07 -06:00
Tarjei Husøy
3a8ad1ea97 Remove error logging of missing victorops keys 
Similar to https://github.com/saltstack/salt/pull/24868
 2015-07-09 12:09:10 +02:00
Pedro Algarvio
718c874fdd Merge pull request #25216 from jfindlay/bsd_srv 
replace shell code with native python code
 2015-07-09 10:58:44 +01:00
Rafael Uzarowski
54f2bbee1c Fix pylint warnings in cloud/clouds/ec2.py 2015-07-09 10:49:41 +02:00
Justin Findlay
9dbd6d85fb ensure ret is always defined 2015-07-09 01:42:26 -06:00
Joseph Hall
e078a6d924 Merge pull request #25278 from rallytime/fix-25228 
Don't require size for all cloud drivers when checking profile configs
 2015-07-08 20:52:23 -06:00
rallytime
3579709e8b Use a better variable name 2015-07-08 19:48:59 -06:00
rallytime
d60176b396 Don't require size for all cloud drivers when checking profile configs 
Fixes #25228
 2015-07-08 19:43:31 -06:00
Colton Myers
84ce602469 Merge pull request #25271 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-07-08 18:59:34 -06:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
 2015-07-08 16:24:58 -06:00
Nicole Thomas
9e906030a0 Merge pull request #25263 from techhat/nonstandard 
Allow non-standard HTTP requests on tornado
 2015-07-08 15:27:08 -06:00
Justin Findlay
bba556c6ac win_firewall exec mod optional args in delete_rule 2015-07-08 15:04:49 -06:00
Justin Findlay
36f2af6048 single quote win_firewall exec module 2015-07-08 15:04:49 -06:00
Nicole Thomas
4e7346aac4 Merge pull request #25253 from s0undt3ch/2015.8 
Remove the deprecation warning. The driver has been renamed.
 2015-07-08 14:48:31 -06:00
Rafael Uzarowski
2be0b541ae cloud: EC2 Interface property SourceDestCheck is a AttributeBooleanValue (SourceDestCheck.Value=<bool>) at the API 2015-07-08 22:39:17 +02:00
Joseph Hall
ee62c75beb Allow non-standard HTTP requests on tornado 2015-07-08 14:37:50 -06:00
Nicole Thomas
679cdbac69 Merge pull request #25248 from techhat/issue22391 
Do not resize while iterating
 2015-07-08 13:38:36 -06:00
Peter Tripp
72323fcac9 Document SourceDestCheck added in #25242. 2015-07-08 12:31:36 -07:00
Justin Findlay
ffe3a377e7 replace shell code with native python code 2015-07-08 13:18:39 -06:00
rallytime
1b7efa91e0 Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
rallytime
588d4e1b26 More Beryllium references changed to 2015.8.0 2015-07-08 11:11:29 -06:00
Pedro Algarvio
ea7afb49d2 Remove the deprecation warning. The driver has been renamed. 2015-07-08 18:07:49 +01:00
rallytime
b24911a3e1 More Beryllium --> 2015.8.0 version reference changes 2015-07-08 10:57:43 -06:00
Pedro Algarvio
631cee1627 Merge pull request #25244 from rallytime/parted_deprecations 
Remove parted deprecations and fix failing tests
 2015-07-08 17:42:00 +01:00
Nicole Thomas
810b1090ac Merge pull request #25242 from ruzarowski/2015.8 
Make SourceDestCheck flag available to network interface definition
 2015-07-08 10:36:22 -06:00
Joseph Hall
4f2abe5cba Do not resize while iterating 2015-07-08 10:29:22 -06:00
rallytime
abfae94e1d Started changing Beryllium references to 2015.8.0 2015-07-08 10:01:03 -06:00
Mike Place
c6efd2356c Merge pull request #25225 from nmadhok/client-runtime-fix-backport-2015-2 
Backporting fix for issue #25223 on 2015.5 branch
 2015-07-08 09:16:18 -06:00
Mike Place
e6251e78eb Merge pull request #25226 from nmadhok/client-runtime-fix-backport-2015-8 
Backporting fix for issue #25223 on 2015.8 branch
 2015-07-08 09:11:03 -06:00
rallytime
138c4f1e72 Remove parted deprecations and fix failing tests 2015-07-08 09:03:55 -06:00
Mike Place
98e4fde483 Merge pull request #25234 from krak3n/fix/boto_asg_update_args 
Fix: Bug in boto_asg state argument passing to boto_asg module
 2015-07-08 08:59:26 -06:00
Mike Place
5db000d9ca Merge pull request #25222 from rallytime/bp-25219 
Back-port #25219 to 2015.8
 2015-07-08 08:55:17 -06:00
Rafael Uzarowski
62b6d4faef Make SourceDestCheck flag available to network interface definition 2015-07-08 16:44:59 +02:00
Chris Reeves
3da8d7e290 Fixed bug with argument passing from boto_asg state to boto_asg module 
Specifically updating an existing auto scale group passed positional
arguments to keyword arguments resulting in the wrong arguments
end up in the wrong place in the module call.
 2015-07-08 14:08:12 +01:00
Nitin Madhok
02c4ef653f Forgot to correct the spelling 2015-07-08 02:25:41 -04:00
Nitin Madhok
331b27712c Backporting fix for issue #25223 on 2015.8 branch 2015-07-08 02:24:29 -04:00
Nitin Madhok
391b7d6730 Backporting fix for issue #25223 on 2015.2 branch 2015-07-08 02:19:45 -04:00