Commit Graph

988 Commits

Author SHA1 Message Date
Chris Henry
6743a41b26 Fix merge conflict, 2015-01-18 16:37:56 -05:00
Chris Henry
1f2a913d3a Merge branch 'master' of github.com:behanceops/moto into feature-instance-launch-time
Conflicts:
	moto/ec2/models.py
2015-01-18 16:37:27 -05:00
Chris Henry
40b97d1bb2 Test that launch_time is a iso 8601 string. 2015-01-18 16:30:39 -05:00
Mike Fuller
e2ed5ed733 Merge remote-tracking branch 'upstream/master' into adding_rds2_support 2015-01-19 08:22:27 +11:00
Chris Henry
19a1b74c5b Change timestamp format to ISO 8601, as per http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html 2015-01-18 16:20:59 -05:00
Chris Henry
77185f9bee Change timestamp format to ISO 8601, as per http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html 2015-01-18 16:18:34 -05:00
Mike Fuller
c6437930de fixed up tests for create_option_group, fixed return json to have major_version correct 2015-01-19 08:06:37 +11:00
Chris Henry
062256ada3 Use the current time when launching an instance. 2015-01-18 15:53:59 -05:00
Mike Fuller
8c16517f10 building out new RDS2 Mock.
completed:
 * create_db_instance()
 * create_option_group()
2015-01-19 07:38:10 +11:00
Steve Pulec
c22ea3014b Add SNS topics to cloudformation. 2015-01-17 19:48:08 -05:00
Steve Pulec
f19fdc9802 Cleaner code. 2015-01-17 19:10:19 -05:00
Steve Pulec
585ef7b768 Add route53 health checks. 2015-01-17 19:06:43 -05:00
Steve Pulec
adb26986eb Add route53 ResourceSet to Cloudformation. 2015-01-17 15:37:46 -05:00
Steve Pulec
42cd333d51 Refactor Route53 record sets. 2015-01-17 14:50:19 -05:00
Steve Pulec
5d5f241b99 Add route53 support to cloudformation. 2015-01-17 10:17:25 -05:00
Steve Pulec
babb7450ec Add RDS to readme. 2015-01-11 16:42:58 -05:00
Steve Pulec
25326790c2 Merge pull request #286 from spulec/rds
Rds
2015-01-11 16:42:06 -05:00
Steve Pulec
1ca651e106 Skip some tests for py3 since boto is not compatible yet. 2015-01-11 16:39:39 -05:00
Steve Pulec
4c40f39a68 Fix for py26. 2015-01-11 16:27:02 -05:00
Steve Pulec
ae6a05af72 Add missing fixture. 2015-01-11 16:17:53 -05:00
Steve Pulec
166f4893ba Add cloudformation for RDS. 2015-01-11 16:15:08 -05:00
Steve Pulec
12118374bd Add database replicas. 2015-01-10 13:50:37 -05:00
Steve Pulec
7559fbe0d1 Add RDS Subnet groups 2015-01-09 00:17:20 -05:00
Steve Pulec
809046e00e Add RDS security groups. 2015-01-08 23:44:05 -05:00
Steve Pulec
dbe3eb5459 Add database CRUD. 2015-01-08 22:18:06 -05:00
Steve Pulec
e05a061993 Add support for Cloudformation Mappings. 2015-01-07 22:32:51 -05:00
Steve Pulec
b8a11b7b8d Python 3 fixes. 2015-01-07 21:40:03 -05:00
Steve Pulec
8da6437689 Add some support for Cloudformation Conditions. Closes #285. 2015-01-07 21:37:12 -05:00
Steve Pulec
1e4df18c42 Allow actual use of cloudformation input parameters. 2014-12-31 14:21:47 -05:00
Steve Pulec
56007660d8 Cleanup parameter parsing. 2014-12-31 13:23:08 -05:00
Steve Pulec
fceeed0c9f PY3 fixes. 2014-12-29 22:17:50 -05:00
Steve Pulec
186ee6a5a4 Add cloudformation stack parsing for S3 keys. 2014-12-29 22:12:23 -05:00
Steve Pulec
3e71020eaa Merge pull request #282 from thedrow/patch-2
Use travis new build workers.
2014-12-29 13:46:11 -05:00
Omer Katz
5881774e89 Use travis new build workers. 2014-12-28 15:37:13 +02:00
Steve Pulec
45e8627ed5 Merge pull request #281 from DreadPirateShawn/ImproveTemplatePerformance
Performance: Leverage jinja2's Environment to cache compiled Templates.
2014-12-12 18:07:55 -05:00
dreadpirateshawn
aff5dd408c Performance: Leverage jinja2's Environment to cache compiled Templates. (fixed merge) 2014-12-12 13:05:46 -08:00
dreadpirateshawn
7ce83082ca Merge remote-tracking branch 'origin/master' into ImproveTemplatePerformance
Conflicts:
	moto/s3/responses.py
2014-12-12 12:51:29 -08:00
dreadpirateshawn
9affa7753d Performance: Leverage jinja2's Environment to cache compiled Templates. 2014-12-12 12:46:07 -08:00
Steve Pulec
4ab3b318eb Add S3 location response. Closes #279. 2014-12-10 20:44:00 -05:00
Steve Pulec
a2e56afef8 Add special S3 bucket create logic for us-east-1. Closes #273. 2014-12-10 20:20:51 -05:00
Steve Pulec
845c468f32 Merge pull request #278 from cameron-r/master
Add filtering of instances by security group id
2014-12-10 20:11:25 -05:00
Steve Pulec
42b5d509d2 Merge pull request #275 from tsanders/vpn_gateway_routes
Add support for route table routes to target virtual private gateways.
2014-12-10 20:09:18 -05:00
Cameron Rowshanbin
573a73aa01 With @ethome, add filtering of instances by security group id 2014-12-10 11:53:40 -06:00
Tyler Sanders
b513d69313 Add support for route table routes to target virtual private gateways. 2014-12-09 12:07:14 -06:00
Steve Pulec
3a82f089a2 Cleanup metadata setting and add fix for multipart uploads. Closes #274. 2014-12-07 12:43:14 -05:00
Steve Pulec
6331c2e1f1 IAM py3 fix. 2014-12-06 19:42:42 -05:00
Steve Pulec
d1ad6400af Merge branch 'kevgliss-enhancedIamRoleSupport' 2014-12-06 19:37:19 -05:00
Steve Pulec
20dda251f8 Updates for IAM changes. 2014-12-06 19:37:10 -05:00
Steve Pulec
7b81a0cb95 Merge branch 'enhancedIamRoleSupport' of https://github.com/kevgliss/moto into kevgliss-enhancedIamRoleSupport 2014-12-06 19:31:18 -05:00
Steve Pulec
ea2e404129 Merge pull request #272 from tsanders/vpc_vpn
Virtual Private Gateway functionality
2014-12-05 21:02:49 -05:00