Commit Graph

8721 Commits

Author SHA1 Message Date
Paul Stack c2feea063b Merge pull request #5126 from lwander/b-gcp-template-disk-type-doc
provider/google: Fix documentation around GCE Disk Type
2016-02-13 18:35:50 +00:00
James Nugent e343bdfa0e Merge pull request #5127 from lwander/b-gcp-route-docs
provider/google: Route doc zone update
2016-02-13 10:31:49 -08:00
Lars Wander 08f86e65ba provider/google: Route doc zone update 2016-02-13 10:23:55 -05:00
Lars Wander 70a6419189 provider/google: Fix documentation around GCE Disk 2016-02-13 10:20:56 -05:00
Radek Simko 903fca7fca Update CHANGELOG.md 2016-02-13 13:32:17 +00:00
Radek Simko 0e66f67246 Merge pull request #4986 from TimeIncOSS/f-aws-cloudwatch-events
provider/aws: Add support for CloudWatch Events
2016-02-13 13:29:50 +00:00
Radek Simko 30e5ec7b19 examples: Add examples for CloudWatch Events 2016-02-13 13:21:33 +00:00
Radek Simko e288b161d7 provider/aws: Document CloudWatch Events 2016-02-13 13:21:33 +00:00
Radek Simko 30082a4c85 provider/aws: Add acc tests for CloudWatch Event Target 2016-02-13 13:21:33 +00:00
Radek Simko 61afc6d34d provider/aws: Add CloudWatch Event Target 2016-02-13 13:21:33 +00:00
Radek Simko b5039dd897 provider/aws: Add acc tests for CloudWatch Event Rule 2016-02-13 13:21:33 +00:00
Radek Simko ab89e5e528 provider/aws: Add CloudWatch Event Rule 2016-02-13 13:21:32 +00:00
Radek Simko 65ac8649ef deps: Vendor aws/aws-sdk-go/service/cloudwatchevents 2016-02-13 12:43:11 +00:00
James Nugent 636f05a941 Merge pull request #5075 from uber/fix-issue-4895
provider/google: Fix google_compute_backend_service max_utilization backend attribute
2016-02-12 13:15:48 -08:00
clint shryock a7af4c46b2 rename test 2016-02-12 11:21:03 -06:00
Clint 6366cc0f5e Update CHANGELOG.md 2016-02-12 10:31:40 -06:00
Clint 169b63e401 Merge pull request #5032 from clstokes/f-aws-gateway-tunnel-info
provider/aws: Expose additional VPN Connection attributes.
2016-02-12 10:31:23 -06:00
Clint 78dd60fd5d Update CHANGELOG.md 2016-02-12 10:09:41 -06:00
Clint a1df07c919 Merge pull request #5114 from hashicorp/pr-4263
provider/aws: support custom endpoints for AWS EC2 ELB and IAM [GH-4263]
2016-02-12 10:09:17 -06:00
Hasan Türken 766dac4d79 update documentation 2016-02-12 09:56:48 -06:00
Hasan Türken e41266e971 Move endpoint options into endpoints block 2016-02-12 09:38:21 -06:00
Hasan Türken 231604e8b7 support custom endpoints for AWS EC2 ELB and IAM 2016-02-12 09:35:50 -06:00
Clint a6d3c4e181 Merge pull request #5087 from vmindru/master
aws_instance docs
2016-02-12 09:09:21 -06:00
Paul Hinze 66ec38b2d9 Merge pull request #5046 from tpounds/use-built-in-schema-string-hash
Use built-in schema.HashString instead of custom hash functions.
2016-02-12 07:58:34 -06:00
Paul Stack 72dbb79e6f Merge pull request #5111 from shaneog/patch-1
Fix a typo: "encryption" to "encrypted"
2016-02-12 12:55:19 +00:00
Shane O'Grady 86f791aa2b Fix a typo: "encryption" to "encrypted"
Ref PR: #4481
2016-02-12 10:46:05 -02:00
stack72 35cac85579 Merge branch 'alexgear-fix-azure-docs' 2016-02-12 11:40:15 +00:00
Oleksandr Kushchenko a07005eacd Update azure provider documentation. 2016-02-12 11:39:14 +00:00
Bill Fumerola 6e46ef1d46 Merge branch 'master' of github.com:uber/terraform into issue-4895 2016-02-11 18:19:13 -08:00
clint shryock 8b4a366b43 Merge branch 'pr-4969'
* pr-4969:
  provider/aws: All security group mods on first run when restoring from snapshot
2016-02-11 16:40:29 -06:00
clint shryock 21a59fc708 provider/aws: All security group mods on first run when restoring from snapshot 2016-02-11 16:39:53 -06:00
Paul Stack 06fdadf491 Merge pull request #5099 from tpounds/cleanup-aws-type-conversions
provider/aws: Consolidate duplicate list/set type conversions
2016-02-11 22:29:50 +00:00
Clint 5ba221014e Update CHANGELOG.md 2016-02-11 16:12:47 -06:00
Clint 934c31f76b Merge pull request #4969 from Chili-Man/bugfix/aws_provider_rds_security_groups
provider/aws: apply security group changes in EC2 Classic RDS for aws_db_instance
2016-02-11 16:12:12 -06:00
Sander van Harmelen 7c32752332 Merge pull request #4906 from svanharmelen/f-chef-attribute-file
provisioner/chef: make the Chef `attributes` param also accept a raw JSON string
2016-02-11 20:57:56 +01:00
Clint e04450d95f Merge pull request #4958 from hashicorp/b-aws-r53-record-tests
provider/aws: Add a regression test for Route53 records
2016-02-11 13:32:29 -06:00
clint shryock ac17be7bf0 Update changelog link with link to latest release 2016-02-11 13:28:02 -06:00
Michael Mell c000b96f87 add link to CHANGELOG 2016-02-11 10:54:40 -08:00
Trevor Pounds 57a9048510 Consolidate duplicate list/set type conversions. 2016-02-11 00:48:58 -08:00
Radek Simko a6f5b96a80 Merge pull request #5094 from alexclifford/master
Small documentation update
2016-02-11 08:10:56 +00:00
Paul Stack 455ea87061 Update CHANGELOG.md 2016-02-11 05:42:42 +00:00
Paul Stack 47ee916539 Merge pull request #5088 from superseb/docker_host_default
Change default DOCKER_HOST value, fixes #4923
2016-02-11 05:41:48 +00:00
Alex Clifford 706162fb3a Grammar inconsistencies 2016-02-11 10:06:43 +11:00
Sebastiaan van Steenis 4a10530b07 Change default DOCKER_HOST value, fixes #4923 2016-02-10 20:21:17 +01:00
Veaceslav Mindru 9112f9f50e Merge pull request #1 from vmindru/aws_instance_docs
aws instance docs
2016-02-10 19:31:36 +01:00
Veaceslav Mindru 1901533bea aws instance docs
associate_public_ip_address - missing explicit mentioning  that this is a bool.
2016-02-10 19:31:07 +01:00
Paul Hinze 3e69e2eca6 Merge pull request #5085 from hashicorp/phinze/recapture-deps-with-latest-godep
vendor: Recapture deps w/ latest godep
2016-02-10 11:06:44 -06:00
Paul Hinze 8209b40526 vendor: Recapture deps w/ latest godep
The original contents of `vendor` were inadvertently captured with an
older version of `godep`. Here, we recapture dependencies by running the
following:

```
godep restore -v
cat Godeps/Godeps.json | jq -r '.Deps[].ImportPath' | xargs godep update -v
```

The newer godep makes the following changes as it captures dependencies:

 * Skips test files
 * Copies `LICENSE` / `PATENTS` files

There is also an additional diff in `golang.org/x/sys/unix` that looks
very similar to the diff between `master..c65f27f` in that repo, so I'm
guessing that dependency was accidentally captured from master instead
of the commit saved to `Godeps.json`.

All in all, these changes should all be "more correct" and result in
smaller diffs for any future updates made to dependencies.
2016-02-10 10:45:16 -06:00
Joe Topjian fa6e673a97 Merge pull request #5077 from kars7e/master
Fix a typo in openstack network example
2016-02-09 22:24:10 -07:00
Karol Stepniewski 45d76e4634 Fix a typo in openstack network example
OpenStack port uses "fixed_ip" property to specify Fixed IP addresses,
but network example incorrectly uses "fixed_ipS" key.
2016-02-09 17:41:03 -08:00