Commit Graph

2005 Commits

Author SHA1 Message Date
Mitchell Hashimoto 05bc835748 providers/cloudflare: if resource no longer exists, set ID to ""
[GH-301]
2015-06-28 23:28:12 -07:00
Mitchell Hashimoto da1cac623d providers/aws: implement basic fast-path for not being in EC2 for creds 2015-06-28 23:06:49 -07:00
Mitchell Hashimoto 93cedc7ec1 providers/aws: style nitpick 2015-06-28 22:46:49 -07:00
Mitchell Hashimoto 2a5ed6c847 Merge pull request #1841 from josharian/aws-external-creds
providers/aws: detect credentials more robustly
2015-06-28 22:43:56 -07:00
Mitchell Hashimoto e2e8d3746f providers/aws: vpc peering failed == deleted [GH-2322] 2015-06-28 22:35:02 -07:00
Mitchell Hashimoto cc2a5ab18f provider/aws: ignore association not exist on EIP destroy [GH-2295] 2015-06-28 22:30:43 -07:00
Patrick Gray 28506c3750 add composeErrors function to only expose errors that happened 2015-06-28 22:30:54 -04:00
Patrick Gray 0f5c9c012d check length of slices instead of using incorrect type 2015-06-28 20:00:55 -04:00
Patrick Gray c375a72f15 check for empty string instead of nil 2015-06-28 19:39:50 -04:00
Daisuke Fujita 562cf596dc Make elasticache_subnet_group subnet_ids essential 2015-06-28 16:13:25 +09:00
Mitchell Hashimoto 1cc5068b8c provider/aws: nil protection against VPN connections [GH-2144] 2015-06-26 21:22:08 -07:00
Mitchell Hashimoto ad408d8862 provider/aws: vpc delete retry on dependency violation [GH-1628] 2015-06-26 17:26:06 -07:00
Mitchell Hashimoto f6b9e7c1a6 providers/aws: set AMI on read for instance [GH-1571] 2015-06-26 17:12:20 -07:00
Clint Shryock 5938a0806f provider/aws: Read Route 53 after create, to populate computed values 2015-06-26 15:11:29 -05:00
Clint 079e4505a8 Merge pull request #2276 from SamClinckspoor/resource-aws-elasticache-parameter-group
provider/aws elasticache parameter group
2015-06-26 14:01:19 -05:00
Sam Clinckspoor c92b7a980c fixed possibly incorrectly returning destroyed 2015-06-26 20:16:21 +02:00
Radek Simko 594f04e064 Merge pull request #2523 from TimeIncOSS/aws-fix-elb-validation
aws: Fix validation for aws_elb.name
2015-06-26 18:25:30 +01:00
Radek Simko 60a7597a4c aws: Fix validation for aws_elb.name 2015-06-26 18:08:13 +01:00
Radek Simko 2a9293a036 aws: Fix validation for aws_db_instance.identifier 2015-06-26 17:57:13 +01:00
Radek Simko 9528ff1e0a Merge pull request #2519 from TimeIncOSS/f-aws-lc-validation
provider/aws: Add validation for aws_launch_configuration
2015-06-26 15:53:22 +01:00
Radek Simko 685ca374dc Merge pull request #2520 from TimeIncOSS/f-aws-asg-validation
provider/aws: Add validation for aws_autoscaling_group.name
2015-06-26 15:53:14 +01:00
Radek Simko a91db09efe provider/aws: Add validation for aws_iam_role.name 2015-06-26 15:44:56 +01:00
Radek Simko 23459ec840 provider/aws: Add validation for aws_autoscaling_group.name 2015-06-26 15:43:06 +01:00
Radek Simko 36fee9a2f5 provider/aws: Add validation for aws_launch_configuration 2015-06-26 15:40:28 +01:00
Radek Simko 7217a37696 Merge pull request #2517 from TimeIncOSS/f-aws-elb-validation
provider/aws: Add validation for aws_elb.name
2015-06-26 15:33:18 +01:00
Radek Simko 4230a524a4 Merge pull request #2516 from TimeIncOSS/f-aws-db-instance-id-validation
provider/aws: Add validation for aws_db_instance.identifier
2015-06-26 15:30:08 +01:00
Paul Hinze c928d2803c Merge pull request #2497 from rgl/master
provider/digitalocean: check if the droplet no longer exists.
2015-06-26 09:29:07 -05:00
Radek Simko ea7395ffe7 Merge pull request #2518 from TimeIncOSS/f-aws-sg-validation
provider/aws: Add validation for aws_security_group (name+description)
2015-06-26 15:25:15 +01:00
Paul Hinze ad0bfd9cfb Merge pull request #2321 from dpaq/f-add-additonal-protocol-integers-for-acls-and-security-groups
provider/aws: add ah and esp protocol integers for network acls and sg
2015-06-26 09:19:07 -05:00
Radek Simko 4525119a57 provider/aws: Add validation for aws_security_group (name+description) 2015-06-26 15:10:04 +01:00
Radek Simko 6f2fb0db38 provider/aws: Add validation for aws_elb.name 2015-06-26 15:08:00 +01:00
Radek Simko 3a9852568a provider/aws: Add validation for aws_db_instance.identifier 2015-06-26 15:06:36 +01:00
Paul Hinze d82d803690 Merge pull request #2510 from CpuID/cpuid_gh2509
default_cooldown change shouldnt force new resource
2015-06-26 08:55:36 -05:00
Paul Hinze db11d80947 Merge pull request #2515 from aznashwan/f-azure-instance-services
provider/azure: Made instances deployable on already existing services.
2015-06-26 08:54:57 -05:00
Paul Hinze 4a14d83733 Merge pull request #2513 from TimeIncOSS/f-aws-validation-db-subnet-group
aws: Add validation for aws_db_subnet_group.name
2015-06-26 08:46:39 -05:00
aznashwan 6ea0397e07 Made instances deployable on already existing services. 2015-06-26 15:49:05 +03:00
Radek Simko f424085f44 provider/aws: Add validation for aws_vpc.cidr_block
- closes #2340
2015-06-26 12:44:26 +01:00
Radek Simko ca83dc2118 provider/aws: Add validation for aws_db_subnet_group.name 2015-06-26 12:39:55 +01:00
Radek Simko 765be4c768 provider/aws: Fix naming in validation of db_instance.final_snapshot_identifier 2015-06-26 12:10:26 +01:00
Nathan Sullivan 4a791c1b41 default_cooldown change shouldnt force new resource - https://github.com/hashicorp/terraform/issues/2509 - credit to
@phinze and @mzupan for https://github.com/hashicorp/terraform/pull/2147
2015-06-26 15:51:31 +10:00
Rui Lopes 02791d70df provider/digitalocean: check if the droplet no longer exists. 2015-06-25 22:17:56 +01:00
aznashwan 1e08c6e72f Made Azure security group rules - security groups relationship one - many. 2015-06-25 21:57:38 +03:00
Clint de5df6f378 Merge pull request #2462 from johnewart/dynamodb_throttle
dynamodb - Support backing off a bit when throttling / limit-exceeded exceptions happen
2015-06-25 12:29:09 -05:00
Clint Shryock 2e23210e58 poll ElastiCache cluster status on update 2015-06-25 11:10:02 -05:00
Clint Shryock 93a577880b provider/aws: Allow in-place updates for ElastiCache cluster 2015-06-25 11:09:29 -05:00
Mitchell Hashimoto 25fa84974b update CHANGELOG 2015-06-25 09:07:11 -07:00
Mitchell Hashimoto 02624118b3 Merge pull request #2489 from joshgarnett/aws_instance_monitoring
provider/aws: adding support for detailed monitoring of instances
2015-06-25 09:05:15 -07:00
Mitchell Hashimoto ecbd5a5013 Merge pull request #2455 from semarj/master
dynamodb - only require nonkey attributes on INCLUDE
2015-06-25 09:03:44 -07:00
Jeff Mitchell edbc578316 As discussed on the issue, remove the hard-coded delay on startup in
favor of attempting to detect if the initial container ever enters
running state, and erroring out if not. It will re-check the container
once every 500ms for 15 seconds total; future work could make that
configurable.
2015-06-25 15:11:00 +00:00
Joshua Garnett d23f534d26 Adding support for detailed monitoring of instances 2015-06-25 10:58:28 -04:00
Jeff Mitchell 56cfba2509 Fix a serious problem when using links.
Links cause there to be more than one name for a container to be
returned. As a result, only looking at the first element of the
container names could cause a container to not be found, leading
Terraform to remove it from state and attempt to recreate it.
2015-06-25 14:40:03 +00:00
Jeff Mitchell 2e01e0635b When linking to other containers, introduce a slight delay; this lets
the Docker API get those containers running. Otherwise when
you try to start a container linking to them, the start command
will fail, leading to an error.
2015-06-25 14:40:03 +00:00
Joshua Semar 7e05b083d3 include keys only projection type 2015-06-25 09:30:44 -05:00
Clint 7a15090208 Merge pull request #2472 from hashicorp/f-aws-asg-update-elbs
provider/aws: Update ASGs to support in-place updates for Load Balancers
2015-06-25 08:55:46 -05:00
Joshua Semar 46fed750a5 simple acc test covering more projection types 2015-06-25 03:38:17 -05:00
Sander van Harmelen b7b770d0da Update user date size check
This makes sure we check the right thing.
2015-06-25 09:45:39 +02:00
Sander van Harmelen 0d36c24c54 Merge pull request #2391 from chiradeep/master
increase allowed size of userdata for cloudstack provider
2015-06-25 09:39:04 +02:00
Mitchell Hashimoto ebc33d874a providers/openstack: fix vet issue 2015-06-24 23:16:06 -07:00
Mitchell Hashimoto ede6af8763 Merge pull request #1921 from jtopjian/openstack-servergroup-schedulerhints
provider/openstack: scheduler_hints and servergroups
2015-06-24 23:13:25 -07:00
Mitchell Hashimoto d1d2a90158 Revert "provider/openstack: change security groups to set"
This reverts commit 646fd76e07.
2015-06-24 23:10:30 -07:00
Mitchell Hashimoto 38151229b1 Merge pull request #2285 from cvvs/b_provider_openstack_router_adminbool
provider/openstack: change router resource admin_state_up from string to bool
2015-06-24 23:09:14 -07:00
Radek Simko dc26f06b5f Merge pull request #2410 from TimeIncOSS/f-aws-lc-monitoring
provider/aws: Add aws_launch_configuration.enable_monitoring
2015-06-25 07:02:56 +01:00
Mitchell Hashimoto a4070a1972 Merge pull request #2452 from zollie/f-aws-launch-configuration-profile-propagation-wait
provider/aws: Add retry to aws_launch_configuration Create to wait for IAM instance profile propagation
2015-06-24 22:59:42 -07:00
Clint Shryock 6e818785af provider/aws: Update ASGs to support in-place updates for Load Balancers 2015-06-24 16:37:23 -05:00
zollie 579b33b8a2 Retry aws_launch_configuration Create on 'Invalid IamInstanceProfile' error only 2015-06-24 17:11:46 -04:00
Radek Simko 6fdbca8e58 Merge pull request #2466 from TimeIncOSS/f-schema-field-name-validate
schema: Add field name to ValidateFunc
2015-06-24 18:52:53 +01:00
Mitchell Hashimoto 9fc78d4ea1 Merge pull request #2448 from hashicorp/b-openstack-networks
providers/openstack: fix crash case if network is nil [GH-2323]
2015-06-24 10:38:27 -07:00
Mitchell Hashimoto 232916a4de Merge pull request #2449 from hashicorp/b-aws-sg-crash
providers/aws: more guards against crashy cases [GH-2308]
2015-06-24 10:35:04 -07:00
Radek Simko 92db4802b6 schema: Add field name to ValidateFunc 2015-06-24 18:22:12 +01:00
John Ewart fd98cae9cc Increment attemptCount when a LimitExceededException occurs 2015-06-24 07:36:14 -07:00
John Ewart 7718cd194c Support backing off a bit when throttling / limit-exceeded exceptions happen 2015-06-24 07:25:00 -07:00
Mitchell Hashimoto fef5741ded providers/aws: fix another crash case 2015-06-23 22:48:39 -07:00
Mitchell Hashimoto cddd54c3de fmt 2015-06-23 22:31:24 -07:00
Joshua Semar 7948aa720e dynamodb - only require nonkey attributes on INCLUDE 2015-06-23 23:50:29 -05:00
zollie 079a26a655 Wrapped Create in a resource.Retry to wait for IAM instance profile propagation 2015-06-23 22:14:53 -04:00
Mitchell Hashimoto b0169adf02 providers/aws: more guards against crashy cases [GH-2308] 2015-06-23 16:23:24 -07:00
Mitchell Hashimoto 09acd1f79d providers/openstack: fix crash case if network is nil [GH-2323] 2015-06-23 16:19:42 -07:00
Radek Simko 5cf5451d28 Merge pull request #1999 from TimeIncOSS/r53-delegation-set
provider/aws: Add Route 53 delegation set resource
2015-06-23 22:51:47 +01:00
Clint 24c4c55511 Merge pull request #2384 from hashicorp/f-aws-flow-logs
provider/aws: Add FlowLog resource
2015-06-23 15:08:00 -05:00
Paul Hinze 7d26e1408a Merge pull request #2434 from hashicorp/b-sg-rule-crash
provider/aws: fix sg rule crash
2015-06-23 15:01:35 -05:00
Paul Hinze 95235ba2cc Merge pull request #2374 from hashicorp/b-aws-detect-instance-type-drift
provider/aws: detect instance_type drift on aws_instance
2015-06-23 15:01:20 -05:00
Paul Hinze e0fccf2dcc provider/aws: fix sg rule crash
Fixes crash in #2431

Decided that `findResourceSecurityGroup` should return an error when
the SG is not found, since the callers cannot happily continue with a
`nil` SG

Also passes through a few error cases that were being swallowed.

/cc @catsby
2015-06-23 09:25:55 -05:00
Paul Hinze 020dc03234 provider/aws: fix root_block_device for odd AMIs
Some AMIs have a RootDeviceName like "/dev/sda1" that does not appear as a
DeviceName in the BlockDeviceMapping list (which will instead have
    something like "/dev/sda")

While this seems like it breaks an invariant of AMIs, it ends up working
on the AWS side, and AMIs like this are common enough that we need to
special case it so Terraform does the right thing.

Our heuristic is: if the RootDeviceName does not appear in the
BlockDeviceMapping, assume that the DeviceName of the first
BlockDeviceMapping entry serves as the root device.

fixes #2224
2015-06-23 09:01:41 -05:00
Paul Hinze cde64727f3 Merge pull request #2411 from Jberlinsky/master
Improve idempotency of aws_iam_server_certificate provisioning
2015-06-22 18:12:49 -05:00
Paul Hinze aa8cf572a8 Merge pull request #2265 from hashicorp/f-schema-validate-field
Support arbitrary per-field schema validation
2015-06-22 18:01:54 -05:00
Clint Shryock cc43ae8c4b Merge branch 'master' into f-aws-flow-logs
* master:
  Update CHANGELOG.md
  Update CHANGELOG.md
  Added affinity group resource.
  update link to actually work
  provider/azure: Fix SQL client name to match upstream
  add warning message to explain scenario of conflicting rules
  typo
  remove debugging
  Update CHANGELOG.md
  provider/aws: Add docs for autoscaling_policy + cloudwatch_metric_alarm
  provider/aws: Add autoscaling_policy
  provider/aws: Add cloudwatch_metric_alarm
  rename method, update docs
  clean up some conflicts with
  clean up old, incompatible test
  update tests with another example
  update test
  remove meta usage, stub test
  fix existing tests
  Consider security groups with source security groups when hashing
2015-06-22 09:33:42 -05:00
Clint Shryock 87c7f6337d remove flow/deliver log status attributes 2015-06-22 09:31:37 -05:00
Jason Berlinsky 06e2336467 Replace AWS IAM test SSL certificate with self-signed cert, including CA chain 2015-06-21 01:40:29 -04:00
Jason Berlinsky a7b31ac40d Normalize certificate chains as well as certificate bodies when creating AWS IAM SSL certificates 2015-06-21 01:40:09 -04:00
Radek Simko cbddab8a69 provider/aws: Add aws_launch_configuration.enable_monitoring 2015-06-20 23:40:29 +01:00
aznashwan 9b5c99ba28 Added affinity group resource. 2015-06-19 21:53:36 +03:00
Clint Shryock 44eb55f8f6 update link to actually work 2015-06-19 11:50:10 -05:00
Clint Shryock d2176b2d7e Merge branch 'master' into jszwedko-fix-sg
* master:
  provider/azure: Fix SQL client name to match upstream
2015-06-19 11:40:50 -05:00
Clint Shryock 2410824fc9 provider/azure: Fix SQL client name to match upstream
name was changed in 4f4636621e
2015-06-19 11:39:50 -05:00
Clint Shryock a3cbb74a2e Merge branch 'master' into jszwedko-fix-sg
* master: (23 commits)
  typo
  Update CHANGELOG.md
  provider/aws: Add docs for autoscaling_policy + cloudwatch_metric_alarm
  provider/aws: Add autoscaling_policy
  provider/aws: Add cloudwatch_metric_alarm
  Update CHANGELOG.md
  Update CHANGELOG.md
  provider/template: don't error when rendering fails in Exists
  Update CHANGELOG.md
  Added Azure SQL server and service support.
  Update CHANGELOG.md
  docs: clarify wording around destroy/apply args
  Getting Started: Added a Next Step upon finishing install.
  docs: add description of archive format to download page
  docs: snapshot plugin dependencies when releasing
  add v0.5.3 transitory deps
  Fixes support for changing just the read / write capacity of a GSI
  Change sleep time for DynamoDB table waits from 3 seconds to 5 seconds
  Remove request for attribute changes
  Fix AWS SDK imports
  ...
2015-06-19 11:31:41 -05:00
Clint Shryock 645a5aa55b add warning message to explain scenario of conflicting rules 2015-06-19 11:23:59 -05:00
Paul Hinze 611741c108 typo 2015-06-18 15:47:54 -05:00
Chiradeep Vittal f8d190f537 fix compile error not caught by 'make dev' 2015-06-18 10:45:15 -07:00
Patrick Gray 24e2cfb260 test works 2015-06-18 11:10:14 -04:00
Patrick Gray 3266c44b83 rename to more intuitive name and finish tests 2015-06-18 10:53:52 -04:00
Clint Shryock 24ee2e5d53 remove debugging 2015-06-18 08:39:08 -05:00
Clint Shryock 0bf127a805 update test; fix import, interpolate ENV var for log name 2015-06-18 08:35:45 -05:00
Clint Shryock 285a88b664 code cleanups 2015-06-18 08:28:38 -05:00
Chiradeep Vittal 139500e076 increase allowed size of userdata for cloudstack provider 2015-06-17 15:41:25 -07:00
Radek Simko 1411435179 provider/aws: Add support for delegation_set to route53_hosted_zone 2015-06-17 23:24:41 +01:00
Radek Simko bfd8226b89 provider/aws: Add route53_delegation_set 2015-06-17 23:24:41 +01:00
Alex Pilon 14f4e5fe54 provider/aws: Add docs for autoscaling_policy + cloudwatch_metric_alarm 2015-06-17 23:10:23 +01:00
Alex Pilon 05f4b9bfd9 provider/aws: Add autoscaling_policy 2015-06-17 23:10:23 +01:00
Alex Pilon ceeb94e157 provider/aws: Add cloudwatch_metric_alarm 2015-06-17 23:10:23 +01:00
Clint Shryock b3d7bb2b39 fix go vet error 2015-06-17 16:45:14 -05:00
Clint Shryock 1a6aef0ed7 Log Group Name is required/forcenew 2015-06-17 16:33:24 -05:00
Clint Shryock bfdf11c477 provider/aws: Implement AWS Flow Logs 2015-06-17 16:31:21 -05:00
Paul Hinze 5e86e709bc Merge pull request #2386 from hashicorp/b-template-variable-change-failure
provider/template: don't error when rendering fails in Exists
2015-06-17 15:36:11 -05:00
Paul Hinze 385b17d679 provider/template: don't error when rendering fails in Exists
The Exists function can run in a context where the contents of the
template have changed, but it uses the old set of variables from the
state. This means that when the set of variables changes, rendering will
fail in Exists. This was returning an error, but really it just needs to
be treated as a scenario where the template needs re-rendering.

fixes #2344 and possibly a few other template issues floating around
2015-06-17 15:33:07 -05:00
Patrick Gray 7bf27daa64 seems to work 2015-06-17 15:21:41 -04:00
aznashwan 357ed8e774 Added Azure SQL server and service support. 2015-06-17 21:23:16 +03:00
Patrick Gray 2135ff02b7 add works but need tests 2015-06-17 10:56:33 -04:00
Clint b132dd284e Merge pull request #2121 from johnewart/dynamodb
DynamoDB Support
2015-06-17 09:47:13 -05:00
Clint Shryock 640836ee58 rename method, update docs 2015-06-17 09:35:50 -05:00
Clint Shryock 359826be26 clean up some conflicts with 2015-06-16 16:38:26 -05:00
Clint Shryock c1cdac1f76 clean up old, incompatible test 2015-06-16 16:30:33 -05:00
Clint Shryock 3bf89fb81e update tests with another example 2015-06-16 16:21:46 -05:00
Clint Shryock 2d06c81e4b update test 2015-06-16 16:15:07 -05:00
Clint Shryock b25fb8a55d remove meta usage, stub test 2015-06-16 15:54:27 -05:00
Patrick Gray 73e8191983 add to provider 2015-06-16 16:10:45 -04:00
Clint Shryock 8a21bd23ea fix existing tests 2015-06-16 15:09:33 -05:00
Jesse Szwedko 7e0a340baf Consider security groups with source security groups when hashing
Previously they would conflict you had multiple security group rules
with the same ingress or egress ports but different source security
groups because only the CIDR blocks were considered (which are empty
when using source security groups).

Updated to include migrations (from clint@ctshryock.com)

Signed-off-by: Clint Shryock <clint@ctshryock.com>
2015-06-16 14:54:16 -05:00
Paul Hinze 35819b7ae1 provider/aws: detect instance_type drift on aws_instance
fixes #2365
2015-06-16 13:23:50 -05:00
aznashwan 58dd568da9 Cleaned up client creation and handling. 2015-06-16 21:04:35 +03:00
John Ewart 4e219b3bad Fixes support for changing just the read / write capacity of a GSI 2015-06-15 17:05:50 -07:00
Paul Hinze 924278c33f Merge pull request #2226 from Banno/add-aws-route53-health-checks-squashed
provider/aws: add aws_route53_health_check (rebase,squash+docs)
2015-06-15 11:06:03 -05:00
Paul Hinze 1ebe117085 Merge pull request #2052 from aznashwan/azure
provider/azure: added a number of storage and networking resources.
2015-06-12 16:49:36 -05:00
Jeff Mitchell 0558763f87 This puts the image parsing code (mostly) back to how it was before. The
regex solution is extremely complex, which makes it hard to debug and
understand; the original switches and
commenting lay out the various cases in a straightforward fashion. Plus,
implementing namespace/repo support in the original code was a simple
strings.Join call.
2015-06-12 19:36:52 +00:00
aznashwan 82a7f08a86 Removed redundant casting checks. 2015-06-12 22:25:03 +03:00
aznashwan bd371a3c40 Removed obsolete TODO's. 2015-06-12 20:57:25 +03:00
Chris Bednarski 380f3ceb86 Merge pull request #2170 from hashicorp/f-aws-lambda
AWS Lambda functionality
2015-06-12 10:18:27 -07:00
Patrick Gray 2b7e3d0b51 commit create and delete with a start of test 2015-06-12 12:44:35 -04:00
Dan Paquette ccf41461a4 provider/aws: add ah and esp protocol integers for network acls and
security groups
2015-06-11 23:23:42 -04:00
aznashwan ebfbef0d52 Added Storage Queue resource. 2015-06-12 01:55:43 +03:00
aznashwan 137cb9778e Minor fixups, refactors and test updates. 2015-06-11 21:27:40 +03:00
aznashwan 9670e69613 Merge resources unto upstream. 2015-06-11 21:27:40 +03:00
Paul Hinze 35eb5e6395 Merge pull request #2311 from hashicorp/b-aws-empty-vpc-sgs
provider/aws: ignore empty vpc_security_group_ids
2015-06-11 08:49:01 -05:00
Clint 54c74becf2 Merge pull request #2305 from hashicorp/b-aws-sg-rule-self
provider/aws: Fix Security Group Rule self reference bug
2015-06-11 08:44:41 -05:00
Paul Hinze d41c9d46a8 provider/aws: ignore empty vpc_security_group_ids
fixes #2293
2015-06-11 07:59:42 -05:00
Clint Shryock 9885ac8689 provider/aws: Fix issue with associating KeyPairs with Instances 2015-06-10 14:02:26 -05:00
Clint Shryock 1b80674c92 Merge remote-tracking branch 'upstream/master' into b-aws-sg-rule-self
* upstream/master:
  Correct syntax error in group membership test.
  Add beta compute client
2015-06-10 09:41:26 -05:00
Clint Shryock 5c50ba0c2a provider/aws: Fix SG rule self reference bug 2015-06-10 09:40:05 -05:00
Clint Shryock bf3dd5241a Add failing test for #1985 2015-06-10 09:38:11 -05:00
Radek Simko 1693728c32 Merge pull request #2299 from michaeltchapman/syntax_fix
Correct syntax error in group membership test.
2015-06-10 10:07:27 +01:00
Michael Chapman 02e3d30aac Correct syntax error in group membership test.
Fixes #2300. Regression in 4d59019288
2015-06-10 15:29:22 +10:00