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
Justin Findlay
cdb65bc82f
Merge pull request #22629 from ngrennan-inflection/develop
...
Adding ssh_priv option in master configuration file to allow use of agent-forwarding
2015-04-14 08:35:33 -06:00
Claudiu Popescu
4efcf82e32
Fixes pylint
2015-04-14 15:06:00 +02:00
Bo Maryniuk
5d77dcefe6
Report all FS types, if filter was not specified.
2015-04-14 14:37:36 +02:00
Claudiu Popescu
b80b263607
Changed return
2015-04-14 14:07:23 +02:00
Claudiu Popescu
df917fad12
Adds support for getting and setting ec2 instace attributes
2015-04-14 13:38:49 +02:00
Bret Fisher
cb36f1a50f
give SmartOS/sunos5 the correct CONFIG_DIR
...
Fixes #22634
2015-04-14 01:21:48 -04:00
Mike Place
e8f521e62c
Merge pull request #22632 from jacksontj/transport
...
Add some support pyzmq 13.0.x
2015-04-13 20:54:42 -06:00
Matthew Williams
709ae7eeb5
boto_*: another attempt at making lint happy
2015-04-14 01:27:45 +00:00
Matthew Williams
d42325dda2
utils.boto: tweak BotoExecutionError
2015-04-14 01:24:37 +00:00
Thomas Jackson
435fc7ba61
Add some support pyzmq 13.0.x
...
pyzmq 13.0.x was the first version to support *any* tornado in pyzmq, and since 14.0.x they have changed the API (IMO into a more sensible one). This conditionally changes the name to match the new API's naming
2015-04-13 17:43:45 -07:00
Nicole Thomas
a0f0303bfd
Merge pull request #22627 from jfindlay/dev_lint
...
fix develop lint
2015-04-13 18:24:38 -06:00
Thomas S Hatch
4e0c7e7739
Merge pull request #22619 from vladionescu/22609
...
Fixed issue #22609 - yumpkg.group_list is now RHEL 7 (yum 3.4.3) compatible
2015-04-13 16:50:04 -06:00
Nathan Grennan
428b24b9ac
Adding ssh_priv option in master configuration file to allow use of agent-forwarding
2015-04-13 15:42:45 -07:00
Matthew Williams
9f7294d0eb
Merge remote-tracking branch 'origin/develop' into boto_utils
2015-04-13 22:42:28 +00:00
Matthew Williams
b8ead7ab27
utils.boto get_exception -> class
2015-04-13 22:34:19 +00:00
Thomas S Hatch
82597705be
disable silly lint
2015-04-13 16:29:53 -06:00
Thomas S Hatch
c742cecd5a
Merge branch 'boto_vpc_route_table_subnets' of https://github.com/claudiupopescu/salt into claudiupopescu-boto_vpc_route_table_subnets
2015-04-13 16:28:32 -06:00
Justin Findlay
3226c6ccb4
further saltnado lint
2015-04-13 16:28:10 -06:00
Thomas Jackson
3f1558b5d2
No reason to implement get_app in the mixin
2015-04-13 16:28:10 -06:00
Thomas Jackson
13724899d2
Remove unused method
2015-04-13 16:28:10 -06:00
Thomas Jackson
16bc3d0731
Pylint fixup
2015-04-13 16:28:10 -06:00
Thomas S Hatch
a78a5017f3
Merge branch '0xf10e-develop' into develop
2015-04-13 16:22:31 -06:00
Thomas S Hatch
0049a05137
lint
2015-04-13 16:22:14 -06:00
Thomas S Hatch
e5320f6db6
Merge branch 'develop' of https://github.com/0xf10e/salt into 0xf10e-develop
2015-04-13 16:21:52 -06:00
Matthew Williams
b01ef9e7e7
Merge remote-tracking branch 'origin/develop' into boto_utils
2015-04-13 22:11:30 +00:00
Matthew Williams
5d9a1f7f38
boto_elb: let connection errors bubble up
2015-04-13 22:11:12 +00:00
Matthew Williams
66f3c413e3
fix boto_ tests for use with utils.boto
2015-04-13 22:04:00 +00:00
Matthew Williams
36a01c464b
use utils.boto in boto_sqs
2015-04-13 21:57:26 +00:00
Matthew Williams
66d22cefd3
use utils.boto in boto_sns
2015-04-13 21:54:01 +00:00
Matthew Williams
f0b89ea6f1
use utils.boto in boto_route53 and boto_secgroup
2015-04-13 21:48:01 +00:00
Thomas S Hatch
2364dfd0f1
Merge pull request #22094 from gladiatr72/RPM_systemd_NOFILE
...
fine tuning systemd support (or, how not to destroy open-file limits when upgrading your salt-master)
2015-04-13 15:47:34 -06:00
Piotr Kasprzyk
148ec13fdd
Fix word activating
2015-04-13 23:44:48 +02:00
Matthew Williams
bf7bee7624
use utils.boto in boto_iam and boto_rds
2015-04-13 21:40:40 +00:00
