Commit Graph

50637 Commits

Author SHA1 Message Date
Thomas S Hatch
8712a8b14c Merge pull request #22614 from rallytime/apply-22610
Apply release note change to develop
2015-04-13 15:26:25 -06:00
Thomas S Hatch
efb53cb56f Merge pull request #22588 from claudiupopescu/elasticache_subnet_group_support
Boto ElastiCache support for subnet_groups
2015-04-13 14:38:45 -06:00
Thomas S Hatch
205d84fa05 Merge pull request #22587 from isbm/isbm-fsutils-bugfix
Bugfix: fsutils
2015-04-13 14:35:40 -06:00
Nicole Thomas
211120f503 Merge pull request #22600 from nmadhok/develop
additions to doc
2015-04-13 14:26:07 -06:00
Thomas S Hatch
f8ca4a34bd Merge pull request #22581 from claudiupopescu/boto_rds_subnet_support
Boto RDS bug fixes and adds support for subnet_group
2015-04-13 14:25:56 -06:00
Thomas S Hatch
1725ee35f5 Merge pull request #22575 from unicolet/pullrequests/saltgrains/initloop
fix infinite loop introduced by #20124 when init (/proc/1/cmdline) is not in the supported_inits list
2015-04-13 14:25:06 -06:00
Thomas S Hatch
a5584483b0 Merge pull request #22573 from Chronojam/fileclient_get_dir_improv
Fileclient get dir improv
2015-04-13 14:22:55 -06:00
Thomas S Hatch
0a1bc64f44 Merge pull request #22565 from kaszuba/speedup-salt-ssh-execution
Increase frequency of ssh terminal output checking
2015-04-13 14:15:56 -06:00
Thomas S Hatch
0d63b8f835 Merge pull request #22563 from kaszuba/fix-salt-ssh-high-cpu-load
Fix for high cpu usage by salt-ssh
2015-04-13 14:14:54 -06:00
rallytime
1f243d6276 Apply release note change to develop 2015-04-13 13:53:03 -06:00
Nicole Thomas
dcfe4cca7b Merge pull request #22591 from mgwilliams/boto_utils
utils.boto: convenience partials
2015-04-13 11:59:23 -06:00
Nitin Madhok
2fe7669c6f Merge branch 'develop' of https://github.com/saltstack/salt into develop 2015-04-13 13:30:32 -04:00
Claudiu Popescu
08c4941568 Fixes pylint 2015-04-13 19:25:18 +02:00
Thomas S Hatch
2d9b6eb1e0 Merge pull request #22545 from dmyerscough/digital-ocean-v2-tests
Digital Ocean APIv2 Integration Testing
2015-04-13 11:17:20 -06:00
Nitin Madhok
031bb2bd65 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2015-04-13 12:29:39 -04:00
Nitin Madhok
39f31b1ab0 Adding salt.engines.sqs_events.rst to doc 2015-04-13 12:20:42 -04:00
Nitin Madhok
87e70a7d3a Adding salt.engines.logstash.rst to doc 2015-04-13 12:20:09 -04:00
Matthew Williams
45b118f93a Merge remote-tracking branch 'origin/develop' into boto_utils 2015-04-13 15:43:01 +00:00
Matthew Williams
b3ec570499 utils.boto: add convenience partials 2015-04-13 15:42:32 +00:00
Mike Place
6a11ead5b4 Merge pull request #22453 from jacksontj/transport
Abstracted Transport
2015-04-13 09:38:52 -06:00
Claudiu Popescu
a2d52817ba Fixes lint error 2015-04-13 17:28:08 +02:00
Justin Findlay
89c166be04 Merge pull request #22577 from claudiupopescu/boto_vpc_subnet_create_fix
Boto VPC subnet within AZ
2015-04-13 09:11:12 -06:00
Justin Findlay
549ecd3084 Merge pull request #22572 from The-Loeki/patch-1
Small docfix for GitPillar
2015-04-13 09:03:44 -06:00
Claudiu Popescu
7a5a371eb4 Adds support for subnet_groups and syntax changes 2015-04-13 16:16:21 +02:00
Claudiu Popescu
9660b82c1a Fixes parameters passed to subnet_group_absent 2015-04-13 15:43:09 +02:00
Claudiu Popescu
7d2e3404ae Added subnet_group_absent and fixes minor dict returns 2015-04-13 15:37:37 +02:00
Bo Maryniuk
0beaf12cbc Preserve type if not specified 2015-04-13 15:33:01 +02:00
Bo Maryniuk
0341f4e5ba Dead code removal 2015-04-13 15:32:50 +02:00
Claudiu Popescu
9bac8a4ad2 Minor naming fixes 2015-04-13 15:30:56 +02:00
Claudiu Popescu
6deeb38091 Fixes some bugs and adds subnet_group_present 2015-04-13 14:19:46 +02:00
Claudiu Popescu
bbb388450a Fixes subnet availability zone 2015-04-13 13:58:52 +02:00
Umberto Nicoletti
e6dd369437 fix infinite loop introduced by #20124 when the init system is not in the supported_inits list 2015-04-13 13:42:27 +02:00
Chronojam
d717850506 removed warning log 2015-04-13 06:40:26 -04:00
root
1d3fc5ae0f added prefix to cp.get_dir when fetching file list 2015-04-13 06:34:44 -04:00
Ronald van Zantvoort
92829600af Small docfix for GitPillar 2015-04-13 11:53:37 +02:00
Joseph Hall
b7362ee59f Merge pull request #22567 from nmadhok/vmware-cloud-driver
Adding list_snapshots() in vmware cloud driver to be able to list snapshots
2015-04-12 19:41:45 -06:00
Justin Findlay
daaf8f90d5 Merge pull request #22554 from ezheidtmann/fetch-tags-10141
Add `fetch_tags` option to state git.latest. See #10141
2015-04-12 16:29:32 -06:00
Justin Findlay
148ee03629 Merge pull request #22551 from basepi/test.fib
Make test.fib much more naive
2015-04-12 16:25:02 -06:00
Nitin Madhok
208f1df8f6 Be able to list snapshot only for a specific vm/template 2015-04-12 16:11:47 -04:00
Nitin Madhok
5caa7be0e0 Adding list_snapshots() to be able to list all snapshots for all VMs and templates across the VMware environment 2015-04-12 15:51:03 -04:00
Artur Kaszuba
935f0b2213 Increase frequency of ssh terminal output checking 2015-04-12 20:06:42 +02:00
Artur Kaszuba
66120485fb Remove blank line 2015-04-12 20:01:05 +02:00
Erik Johnson
765dda9b92 Merge pull request #22560 from makinacorpus/d
check if docker is running
2015-04-12 12:41:59 -05:00
Nitin Madhok
b9c8992dce Clean up 2015-04-12 13:08:58 -04:00
Artur Kaszuba
b220d0ef42 Fix for high cpu usage by salt-ssh 2015-04-12 18:35:59 +02:00
Mathieu Le Marec - Pasquet
16ec10aa92 check if docker is running
This fixes #22559
2015-04-12 18:28:02 +02:00
Joseph Hall
bbdf316063 Merge pull request #22483 from nmadhok/vmware-cloud-driver
Adding more features to vmware cloud driver
2015-04-11 18:31:03 -06:00
Evan Heidtmann
779951e68d Add fetch_tags option to state git.latest 2015-04-11 14:34:51 -07:00
Colton Myers
c4dd68bbc7 Force num to int 2015-04-11 16:07:59 -04:00
Colton Myers
5b6d410119 Fix calltest 2015-04-11 15:59:06 -04:00