Commit Graph

50760 Commits

Author SHA1 Message Date
Matthew Williams
5dbba08c04 states.boto_vpc: sync vpc.present/absent and subnet.present/absent with execution module; add tests 2015-04-20 15:09:46 +00:00
Matthew Williams
afd182479c modules.boto_vpc: fix a couple bugs 2015-04-20 15:09:01 +00:00
Matthew Williams
d2af26406e loader: add context kwarg to utils 2015-04-20 15:07:01 +00:00
Matthew Williams
9ddfc6c82b boto_vpc: [WIP] always return dicts 2015-04-17 05:18:17 +00:00
Matthew Williams
7347f63741 utils.boto: add additional docs 2015-04-17 05:15:08 +00:00
Matthew Williams
5f2715b73f add utils.compat 2015-04-17 05:14:19 +00:00
Matthew Williams
04f7acd3d4 loader: add missing import
Conflicts:
	salt/loader.py
2015-04-17 04:39:43 +00:00
Matthew Williams
759b522a65 Revert "utils.boto: add temporary ability to use without loader"
This reverts commit 8d3556ebcd.
2015-04-17 00:59:11 +00:00
Matthew Williams
8d3556ebcd utils.boto: add temporary ability to use without loader 2015-04-16 23:04:18 +00:00
Matthew Williams
81540c7eeb add exactly_n and exactly_one funcs to utils 2015-04-15 13:46:30 +00:00
Matthew Williams
9ecf4f38a6 utils.boto: convert BotoExecutionError back to func 2015-04-15 08:30:40 +00:00
Matthew Williams
7fa429cb33 boto_vpc: fix lint 2015-04-15 03:00:10 +00:00
Matthew Williams
3501a28d03 boto_vpc_test: fix indentation 2015-04-15 02:58:06 +00:00
Matthew Williams
4d05730347 boto_vpc: correct a docstring 2015-04-15 02:20:50 +00:00
Matthew Williams
24511ae928 boto_vpc: fix hanging indentation 2015-04-15 02:11:44 +00:00
Matthew Williams
ab7c934b18 boto_vpc: remove superflous blank line 2015-04-15 02:08:11 +00:00
Matthew Williams
9c39634ff4 Merge remote-tracking branch 'origin/develop' into boto_vpc2 2015-04-15 02:06:14 +00:00
Matthew Williams
935b7e87da modules.boto_vpc: remove trailing line 2015-04-15 02:04:08 +00:00
Matthew Williams
db8a9afc16 boto_vpc: remove duplicate func decl; fix string format 2015-04-15 02:00:34 +00:00
Matthew Williams
bef74673d9 Merge branch 'boto_utils' into boto_vpc2 2015-04-15 01:45:31 +00:00
Thomas S Hatch
c5f814bfdb Merge pull request #22689 from mgwilliams/tcp-key
make salt-key work with tcp transport
2015-04-14 19:45:27 -06:00
Thomas S Hatch
79e09616ae Merge pull request #22680 from rallytime/moar_pylint
Pylint fix for develop
2015-04-14 19:39:09 -06:00
Joseph Hall
0408bfef9b Merge pull request #22611 from mgwilliams/boto_utils
use cached connection in boto_* modules
2015-04-14 19:27:46 -06:00
Matthew Williams
88d3d30b88 boto_vpc: one last lint fix 2015-04-15 00:02:58 +00:00
Matthew Williams
87362fd019 fix salt-key display for tcp transport 2015-04-14 23:59:16 +00:00
Matthew Williams
b2588756fd make salt-key work with tcp transport 2015-04-14 23:41:32 +00:00
Matthew Williams
220c9338f3 boto_*: fix incorrect pylint exceptions 2015-04-14 22:43:49 +00:00
rallytime
3cc8788f7b Pylint fix for develop 2015-04-14 15:54:38 -06:00
Matthew Williams
98f06e048f boto_vpc: fix another module<->state discrepency 2015-04-14 21:44:12 +00:00
Matthew Williams
92ad530f60 boto_vpc: fix module<->state discrepencies 2015-04-14 21:32:22 +00:00
Matthew Williams
08c104a24f Merge branch 'boto_utils' into boto_vpc2
Conflicts:
	salt/modules/boto_vpc.py
2015-04-14 20:31:44 +00:00
Matthew Williams
8fa76d7e40 lint on boto_vpc_test 2015-04-14 20:16:30 +00:00
Matthew Williams
9228f1372b lint on boto_rds 2015-04-14 20:15:41 +00:00
Matthew Williams
7df4bd1eb3 lint on boto_sns 2015-04-14 20:15:03 +00:00
Matthew Williams
77f60fb9ca lint on boto_route53 2015-04-14 20:14:32 +00:00
Matthew Williams
6b564076aa lint on boto_dynamodb 2015-04-14 20:13:54 +00:00
Matthew Williams
f8a6082082 lint on boto_vpc 2015-04-14 20:13:13 +00:00
Matthew Williams
46bde83216 Merge remote-tracking branch 'origin/develop' into boto_utils
Conflicts:
	salt/modules/boto_ec2.py
2015-04-14 20:07:57 +00:00
Mike Place
e20e2ae26c Merge pull request #22673 from cachedout/fix_tcpdump
Fix broken salt-tcpdump
2015-04-14 13:36:04 -06:00
Mike Place
c324e568aa Fix broken salt-tcpdump 2015-04-14 13:35:16 -06:00
Justin Findlay
c2f4b6472b Merge pull request #22665 from rallytime/pylinting
Python 3 compat changes to salt/states/boto_vpc.py
2015-04-14 12:55:56 -06:00
Matthew Williams
afb52ecd2c boto_*: a third attempt at making lint happy 2015-04-14 18:16:18 +00:00
rallytime
32e20f3d8e Python 3 compat changes to salt/states/boto_vpc.py 2015-04-14 11:47:39 -06:00
Thomas S Hatch
7d418be420 Merge pull request #22646 from claudiupopescu/boto_ec2_attributes
Boto EC2 instance attributes
2015-04-14 10:44:48 -06:00
Michael Steed
3fa1392edc Merge pull request #22657 from rallytime/pylint_develop
Python 3 Compat for new transport files
2015-04-14 10:10:49 -06:00
Nicole Thomas
26420c3d7b Merge pull request #22628 from thatch45/claudiupopescu-boto_vpc_route_table_subnets
Merge #22527
2015-04-14 10:06:11 -06:00
Justin Findlay
bb528b6fb0 Merge pull request #22620 from kwadrat/develop
Fix Messaging, indicate incomprehensible word
2015-04-14 09:32:22 -06:00
rallytime
63c3ada4fd Python 3 Compat for new transport files 2015-04-14 09:16:42 -06:00
Justin Findlay
1e747309ac Merge pull request #22648 from isbm/isbm-fsutils-fixes
Bugfix: Report all FS types, if filter was not specified.
2015-04-14 09:09:45 -06:00
Justin Findlay
2fc5a0fd7b Merge pull request #22635 from BretFisher/sunos5_config_dir
give SmartOS/sunos5 the correct CONFIG_DIR
2015-04-14 08:39:58 -06:00