Commit Graph

6862 Commits

Author SHA1 Message Date
Max Englander fa94d7f7ec Merge branch 'master' into 2087-consul-service-resource 2015-10-29 11:43:12 -04:00
Max Englander 5f5fd7c6e6 make good use of ForceNew in consul_agent_service 2015-10-29 11:39:27 -04:00
Clint 0961f5c159 Update CHANGELOG.md 2015-10-29 08:25:00 -05:00
Clint cb2ecf5733 Merge pull request #3255 from Runscope/local-kinesis
provider/aws: allow local kinesis
2015-10-29 08:24:07 -05:00
Paul Hinze 80631683d1 Update CHANGELOG.md 2015-10-29 07:33:03 -05:00
Paul Hinze 38c20a58c7 Merge pull request #3636 from rakutentech/fix-connection-info
provider/vsphere: Fix d.SetConnInfo error in case of a missing IP address
2015-10-29 07:28:16 -05:00
Max Englander da70103a05 Merge branch 'master' of github.com:hashicorp/terraform into 2087-consul-service-resource 2015-10-29 05:04:40 -04:00
Max Englander 8d6b71e2ae use ForceNew on just about all catalog entry attributes; struggle in the hell of 'diffs mismatch' 2015-10-29 05:04:25 -04:00
Radek Simko 485dbcc510 Update CHANGELOG.md 2015-10-29 07:04:24 +00:00
Radek Simko 678c7e905a Merge pull request #3094 from TimeIncOSS/f-aws-cloudtrail
provider/aws: Add support for CloudTrail
2015-10-29 07:03:17 +00:00
Clint d19a4ddf2b Update CHANGELOG.md 2015-10-28 14:15:19 -05:00
Clint 191b6c826f Merge pull request #3674 from hashicorp/pr-2836
provider/aws: Add notification topic ARN for ElastiCache clusters (continuation from #2836)
2015-10-28 14:14:53 -05:00
clint shryock 2cd47ec195 add test for elasticache cluster and topic arn 2015-10-28 14:09:45 -05:00
clint shryock 9aeb04909c Merge branch 'master' into pr-2836
* master: (335 commits)
  Update CHANGELOG.md
  config: return to the go1.5 generated lang/y.go
  Update CHANGELOG.md
  Allow cluster name, not only ARN for aws_ecs_service
  Update CHANGELOG.md
  Add check errors on reading CORS rules
  Update CHANGELOG.md
  website: docs for null_resource
  dag: use hashcodes to as map key to edge sets
  Update CHANGELOG.md
  Update CHANGELOG.md
  Update CHANGELOG.md
  Use hc-releases
  provider/google: Added scheduling block to compute_instance
  Use vendored fastly logo
  Use releases for releases
  Update CHANGELOG.md
  Update CHANGELOG.md
  Update vpn.tf
  Update CHANGELOG.md
  ...
2015-10-28 13:20:10 -05:00
Radek Simko 7c4849541a aws: Add docs for aws_cloudtrail 2015-10-28 17:14:24 +00:00
Radek Simko 7265bdaaf0 aws: Add acceptance test for aws_cloudtrail 2015-10-28 17:13:14 +00:00
Radek Simko a618b048cf aws: Add support for aws_cloudtrail 2015-10-28 17:13:14 +00:00
Radek Simko 22ec52396a Update CHANGELOG.md 2015-10-28 16:30:03 +00:00
Radek Simko 91f4be2261 Merge pull request #3668 from TimeIncOSS/b-aws-ecs-cluster-arn
provider/aws: Allow cluster name, not only ARN for aws_ecs_service
2015-10-28 16:28:47 +00:00
Paul Hinze af04321723 config: return to the go1.5 generated lang/y.go
It has improvements to error messaging that we want.

We'll use this occasion begin developing / building with Go 1.5 from
here on out. Build times will be slower, but we have core development
plans that will help mitigate that.

/cc @hashicorp/terraform-committers
2015-10-28 12:20:18 -04:00
Radek Simko 192111074a Update CHANGELOG.md 2015-10-28 16:17:20 +00:00
Radek Simko 0d8d6fde79 Merge pull request #2636 from TimeIncOSS/f-aws-cloudformation
provider/aws: Add aws_cloudformation_stack
2015-10-28 16:16:14 +00:00
Radek Simko 784aadd505 Allow cluster name, not only ARN for aws_ecs_service 2015-10-28 15:43:42 +00:00
Clint 89fb16ada0 Update CHANGELOG.md 2015-10-28 10:10:06 -05:00
Clint 5cedd64a15 Merge pull request #3387 from kjmkznr/s3-cors
provider/aws: Add CORS settings to S3 bucket
2015-10-28 10:09:44 -05:00
Kazunori Kojima 122790d32b Add check errors on reading CORS rules 2015-10-28 09:19:37 +09:00
Mitchell Hashimoto 5e282683bf Merge pull request #3658 from hashicorp/b-dag-hashcode
dag: use hashcodes to as map key to edge sets
2015-10-27 15:08:15 -07:00
Paul Hinze ed95163984 Update CHANGELOG.md 2015-10-27 16:17:19 -05:00
Paul Hinze fc3bda3651 Merge pull request #3659 from hashicorp/phinze/doc-null-resource
website: docs for null_resource
2015-10-27 16:16:25 -05:00
Paul Hinze 7f800f3498 website: docs for null_resource 2015-10-27 15:28:37 -05:00
Mitchell Hashimoto 05794199af dag: use hashcodes to as map key to edge sets 2015-10-27 11:58:34 -07:00
Paul Hinze 1152ee9a53 Merge pull request #3244 from Banno/make-null-resource-more-useful
Add triggers to the null_resource
2015-10-27 13:30:54 -05:00
Mitchell Hashimoto 62758e99b5 Update CHANGELOG.md 2015-10-27 08:49:41 -07:00
Dave Cunningham f1c6673e1b Update CHANGELOG.md 2015-10-26 19:37:35 -04:00
Dave Cunningham 66336f577a Merge pull request #3643 from lwander/f-gcp-instance-scheduling
provider/google: Added scheduling block to compute_instance
2015-10-26 19:29:33 -04:00
Clint 03a770e96a Update CHANGELOG.md 2015-10-26 16:44:39 -05:00
Clint 3ce656b007 Merge pull request #2890 from pforman/asg-termination
Update AWS ASG termination policy code and tests
2015-10-26 16:42:53 -05:00
Seth Vargo 60c508b9ea Merge pull request #3644 from hashicorp/sethvargo/tf
Use hc-releases
2015-10-26 17:33:05 -04:00
Seth Vargo e98ab725c2 Use hc-releases 2015-10-26 17:21:04 -04:00
Seth Vargo f3ab7f2559 Merge pull request #3637 from hashicorp/sethvargo/releases
Use releases for releases
2015-10-26 17:01:28 -04:00
Lars Wander 5a311dbd11 provider/google: Added scheduling block to compute_instance 2015-10-26 16:16:06 -04:00
Seth Vargo 74d1486a4d Use vendored fastly logo 2015-10-26 11:53:42 -04:00
Seth Vargo 456f1a7676 Use releases for releases 2015-10-26 11:48:59 -04:00
Dave Cunningham 8b70867fdd Update CHANGELOG.md 2015-10-26 03:04:45 -04:00
Dave Cunningham c0bf7aecb3 Merge pull request #3554 from lwander/f-gcp-version
provider/google: Accurate Terraform Version
2015-10-26 02:59:51 -04:00
Dave Cunningham ccdadf88f6 Update CHANGELOG.md 2015-10-26 02:58:59 -04:00
Dave Cunningham a4eee72c78 Merge pull request #3620 from lwander/b-gcp-large-instance-group-timeout
provider/google: Fixed timeout bug on large instance groups
2015-10-26 02:56:18 -04:00
Dave Cunningham 3b91f047a3 Update vpn.tf
Fix grammar in comment
2015-10-26 00:49:44 -04:00
Takaaki Furukawa 8390154968 provider/vsphere: Fix d.SetConnInfo error in case of a missing IP address 2015-10-26 10:32:19 +09:00
Martin Atkins 7e539ef2cb Update CHANGELOG.md 2015-10-25 14:27:20 -07:00