Commit Graph

15 Commits

Author SHA1 Message Date
Kris Raney
4809e09f52 Fix pylint errors 2016-03-08 11:54:03 -06:00
Kris Raney
3487f55e83 Add NAT Gateway support to boto_vpc 2016-03-07 09:41:03 -06:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
2016-02-11 22:33:49 -07:00
rallytime
adb85892de Fix failing state module tests 2016-02-04 00:01:11 +00:00
Mike Place
d19827fd3a Disable some boto tests per resolution of moto issue
Pending resolution of https://github.com/spulec/moto/issues/493
2015-12-15 14:59:14 -07:00
Mike Place
a2b1f41f49 Disable some boto tests per resolution of moto issue
Pending resolution of https://github.com/spulec/moto/issues/493
2015-12-15 14:57:52 -07:00
Mike Place
27b917b623 Adjust tests for new loader spec 2015-11-16 12:23:05 -07:00
Colton Myers
964a47c643 Fix tests 2015-08-28 13:50:31 -06:00
Matthew Williams
63cc88ed64 states.boto_vpc: use separate subnet_ids and subnet_names kwargs in route_table_present 2015-04-28 21:37:05 +00:00
Matthew Williams
796fd603e8 use Mixin for Subnets test case in boto_vpc state module tests 2015-04-27 16:56:07 +00:00
Matthew Williams
76f739d7c7 boto_vpc: lint 2015-04-27 16:05:55 +00:00
Matthew Williams
6752c810be add additional tests for boto_vpc state 2015-04-27 06:08:08 +00:00
Matthew Williams
899427a7be boto_vpc: lint 2015-04-25 17:33:16 +00:00
Matthew Williams
e6a02a65ea WIP: states.boto_vpc: sync with execution module changes 2015-04-25 17:26:43 +00:00
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