Commit Graph

9609 Commits

Author SHA1 Message Date
Paul Stack 31c9dd11eb Merge pull request #5914 from davedash/patch-2
ssl_certificate_id applies to lb_protocol only.
2016-03-30 08:42:18 -05:00
James Nugent c44daa7735 Update CHANGELOG.md 2016-03-29 16:19:46 -07:00
James Nugent 155e7840ba provider/triton: Fix error for VLAN ID validation
Source: https://apidocs.joyent.com/cloudapi/#CreateFabricVLAN

This suggests that the check is correct and the error message and
description are not, so this commit makes them match the docs.
2016-03-29 16:17:47 -07:00
James Nugent 2b34eb5a39 Merge branch 'f-triton-fabric' of https://github.com/asteris-llc/terraform into asteris-llc-f-triton-fabric 2016-03-29 16:17:12 -07:00
Colin Hebert d7a7db9c5a provider/aws: Subnet group description modification
Do not force a new resource when changing the description of a subnet group
2016-03-30 09:33:44 +11:00
Brian Hicks df2a192e4a triton: add fabric resource 2016-03-29 17:13:03 -05:00
Brian Hicks 7332b0ef9e triton: add VLAN resource 2016-03-29 16:38:34 -05:00
Matt Calthrop f4fa94b825 Address #5912: google-two-tier example incomplete 2016-03-29 22:18:54 +01:00
Dave Dash de61132564 ssl_certificate_id applies to lb_protocol only. 2016-03-29 14:13:54 -07:00
Alex Gray 50c050bb92 Elasticsearch times out. It takes a while to create. lets increase the timeout. 2016-03-29 15:58:40 -04:00
Clint 7d1cfde490 Merge pull request #5887 from hashicorp/b-aws-iam-server-cert-docs
provider/aws: Document lifecycle block needs for IAM Server Certificate
2016-03-29 14:35:52 -05:00
Paul Hinze 1f1503a5f1 Update CHANGELOG.md 2016-03-29 13:21:21 -05:00
Paul Hinze faba2b7d31 Merge pull request #5867 from hashicorp/phinze/fix-route-crash
provider/aws: fix potential aws_route crashes
2016-03-29 13:20:36 -05:00
Radek Simko 2e415df23c Update CHANGELOG.md 2016-03-29 16:35:15 +01:00
Radek Simko c7a8f05e03 Merge pull request #5890 from meteor/jsonencode
config: new interpolation function jsonencode
2016-03-29 16:33:20 +01:00
Paul Hinze 70096c5ac0 provider/aws: fix potential aws_route crashes
Fixes #5865
2016-03-29 09:57:29 -05:00
David Glasser 6cf06bb3ab config: new interpolation function jsonencode 2016-03-29 07:38:58 -07:00
James Nugent 1c399d119a Merge pull request #5897 from PurrBiscuit/datadog
fix typo in datadog provider documentation
2016-03-29 09:26:19 -05:00
Purrbiscuit 55269ae8d8 fix typo in datadog provisioner documentation 2016-03-29 10:19:28 -04:00
clint shryock ac063bf573 provider/aws: Document lifecycle block needs for IAM Server Certificate 2016-03-28 15:39:54 -05:00
Radek Simko 1ce0f1b828 docs: Add some details about API Gateway resources 2016-03-28 20:15:15 +01:00
Clint 1b1e4620c7 Update CHANGELOG.md 2016-03-28 13:24:14 -05:00
Clint 163173df7a Merge pull request #5881 from hashicorp/b-aws-sg-r-protocols
provider/aws: Convert protocols to standard format for Security Groups
2016-03-28 13:23:52 -05:00
clint shryock 1a2846072c update tests to cover icmp 2016-03-28 13:08:53 -05:00
James Nugent e9d12d5021 Merge pull request #5883 from uber/b-gcp-deprecated-image
provider/google: use non-deprecated image in acctests, docs
2016-03-28 12:53:44 -05:00
clint shryock e98d7d706f provider/aws: Convert protocols to standard format for Security Groups
Convert network protocols to their names for keys/state, fixing issue(s) when
using them interchangeably.
2016-03-28 10:32:39 -05:00
James Nugent e1117e8631 Update CHANGELOG.md 2016-03-27 19:45:29 -05:00
James Nugent 8af5315b12 Merge pull request #5878 from stack72/f-azurerm-storage-acc-404
provider/azurerm: Fix not removing azurerm_storage_account 404 from state
2016-03-27 19:43:17 -05:00
stack72 de4b0a9f00 provider/azurerm: Fix not removing azurerm_storage_account 404 from
state
2016-03-27 16:31:55 +01:00
Bill Fumerola 1ccfacd2dd provider/google: use non-deprecated image in acceptance tests, documentation 2016-03-26 09:55:28 -07:00
Paul Stack 07fee770e4 Merge pull request #5869 from jeshuaborges/patch-1
Fix typo in kinesis_firehose_delivery_stream.html.markdown
2016-03-25 21:06:42 +00:00
Jeshua Borges 99a1474545 Fix typo in kinesis_firehose_delivery_stream.html.markdown
Silly fix, but should be updated.
2016-03-25 16:59:26 -04:00
Radek Simko 1324838a15 Merge pull request #5857 from hashicorp/doc-ebs-block-device-mixmatch
provider/aws: doc EBS block device mix-match caveats
2016-03-25 20:41:57 +00:00
Radek Simko 4023fc1ff3 Update CHANGELOG.md 2016-03-25 20:37:37 +00:00
Radek Simko a2c59f071f Merge pull request #5838 from hashicorp/b-aws-lambda-guard
provider/aws: Guard against empty responses from Lambda Permissions
2016-03-25 20:35:57 +00:00
Paul Hinze 3abf815508 Merge pull request #5866 from TimeIncOSS/docs-api-gateway-fix
docs: Fix API Gateway documentation
2016-03-25 15:23:18 -05:00
Radek Simko 3afbadae75 docs: Fix API Gateway documentation 2016-03-25 20:11:00 +00:00
Paul Hinze 5f94449197 Merge pull request #5863 from hashicorp/phinze/aws-fix-lc-wait-for-iam-error
provider/aws: Fix launch_config waiting for IAM instance profile
2016-03-25 13:31:39 -05:00
Paul Hinze 6c2b511152 provider/aws: Fix launch_config waiting for IAM instance profile
AWS changed their error message, which was being used for detection of
the specific error that indicates we need to wait for IAM propagation.

Behavior is covered by a test now.

Fixes #5862
2016-03-25 13:10:10 -05:00
Sander van Harmelen 08e88d60ea Merge pull request #5859 from svanharmelen/f-docs
Update the docs to match the changes made in PR #5587
2016-03-25 18:31:18 +01:00
Sander van Harmelen 22b9e2a7d9 Update the docs to match the changes made in PR #5587 2016-03-25 18:24:16 +01:00
Paul Hinze 7501f32721 provider/aws: doc EBS block device mix-match caveats
refs #5706
2016-03-25 12:12:01 -05:00
Sander van Harmelen 3a44fc7b3f Merge pull request #5587 from hashicorp/b-cloudstack-instance-name
Make name optional on cloudstack_instance resource
2016-03-25 17:08:36 +01:00
Sander van Harmelen e1001f5bd7 Merge pull request #5856 from svanharmelen/b-cloudstack-instance-name
Some minor updates and added a proper test
2016-03-25 17:00:45 +01:00
Sander van Harmelen 5c1f410ebe Some minor updates and added a proper test 2016-03-25 16:59:03 +01:00
Clint 2fa5d42cbd Merge pull request #5851 from Jonnymcc/patch-1
Fix broken sentence regarding computed values
2016-03-25 09:39:33 -05:00
Jonathan McCall 3cd6b29a76 Fix broken sentence regarding computed values 2016-03-25 10:34:47 -04:00
James Nugent 64c73b93ef Merge pull request #5840 from hashicorp/f-windows-makefile
build: Remove unmaintained Windows build.bat file
2016-03-25 03:18:17 -07:00
James Nugent 43341e41ff deps: Update github.com/aws/aws-sdk-go 2016-03-24 15:52:51 -07:00
James Nugent 59e52311ab build: Remove unmaintained Windows build.bat file
This was never updated for vendored dependencies and no longer works
correctly. Since we cross-compile release builds I am not sure it is
critical - though if someone in the community wants to maintain this we
can consider re-adding it via a pull request.
2016-03-24 15:00:05 -07:00