Commit Graph

9447 Commits

Author SHA1 Message Date
Paul Hinze b2d3f92f7b Merge pull request #4893 from ack/clc
provider/clc: CenturyLink Cloud Provider
2016-03-21 18:33:00 -05:00
Paul Hinze f6f1d51a6c Update CHANGELOG.md 2016-03-21 18:32:27 -05:00
Paul Hinze 7efc8b25a5 Merge pull request #5772 from hashicorp/phinze/var-concurrent-map-race
terraform: share graph walker's variables lock w/ interpolater
2016-03-21 18:29:25 -05:00
Paul Hinze 024dcc9d32 terraform: share graph walker's variables lock w/ interpolater
The ContextGraphWalker struct includes a lock that's passed down to
BuiltinEvalContext and guards access to interpolation variables as
they're written using SetVariables.

The likely problem being expressed in #5733 is that the same map
reference is also passed down to the Interpolater.Variables field, which
is used for variable lookup.

Here, we plumb the same lock we're using to guard access for writes down
and acquire it before doing variable reads as well. It's not as fine
grained as perhaps it could be, but all the context tests pass and I
believe this should address #5733.
2016-03-21 18:21:44 -05:00
Albert Choi 3971f76747 set dc in tests 2016-03-21 15:34:07 -07:00
Albert Choi 4c4be8124a bump vendored sdk, remove extra fields 2016-03-21 15:34:04 -07:00
Paul Stack 79eb4e1b75 Merge pull request #5769 from henning/patch-3
region available is growing
2016-03-21 21:30:08 +00:00
Henning Sprang dbb543a1fd region available is growing
Same as just changed in e46d06bd81 ;)
2016-03-21 22:12:46 +01:00
stack72 af30dc675e Merge branch 'henning-patch-2' 2016-03-21 21:05:36 +00:00
Henning Sprang e46d06bd81 region available is growing 2016-03-21 21:04:30 +00:00
Paul Hinze 9629354399 Update CHANGELOG.md 2016-03-21 15:16:16 -05:00
Paul Hinze 293c6ca68c Revert "Revert "core: Add uuid() interpolate function.""
This reverts commit 661be01d9b.
2016-03-21 15:14:30 -05:00
Paul Hinze 54bae34203 Update CHANGELOG.md 2016-03-21 15:14:11 -05:00
Paul Hinze 20e517475b Merge pull request #5724 from paulodeininger/feature/fix_aws_opsworks_windows
Add DefaultOs on Stack creation (fix Windows stack issue)
2016-03-21 15:10:03 -05:00
Paul Hinze 07bf669d92 Update CHANGELOG.md 2016-03-21 15:08:56 -05:00
Paul Hinze 25d5b6d410 Merge pull request #5635 from hashicorp/phinze/fixup-ignore-changes
core: Address some issues with ignore_changes
2016-03-21 15:08:31 -05:00
Paul Stack 1888733803 Merge pull request #5766 from stack72/f-arm-template
provider/azurerm: Fix a potential panic in the `azurerm_template_deployment` resource
2016-03-21 19:57:21 +00:00
Paul Hinze bea22b1f10 Update CHANGELOG.md 2016-03-21 14:53:08 -05:00
stack72 6aa11e57e5 provider/azurerm: Fix a potential panic in the
`azurerm_template_deployment` resource
2016-03-21 19:50:30 +00:00
Paul Hinze 1d6cecf514 Merge pull request #5758 from stack72/f-arm-template
provider/azurerm: Adding `azurerm_template_deployment` resource
2016-03-21 14:38:49 -05:00
Paul Hinze f480ae3430 core: Fix issues with ignore_changes
The ignore_changes diff filter was stripping out attributes on Create
but the diff was still making it down to the provider, so Create would
end up missing attributes, causing a full failure if any required
attributes were being ignored.

In addition, any changes that required a replacement of the resource
were causing problems with `ignore_chages`, which didn't properly filter
out the replacement when the triggering attributes were filtered out.

Refs #5627
2016-03-21 14:20:36 -05:00
stack72 fe79dcf6c1 provider/azurerm: Add the documentation for the AzureRM Template
Deployment resource
2016-03-21 18:59:54 +00:00
stack72 a4cd5eeb2b provider/azurerm: Scaffold the Azure RM Template Deployment resource 2016-03-21 18:51:38 +00:00
Paul Stack 00b349bd57 Update CHANGELOG.md 2016-03-21 18:51:14 +00:00
stack72 fb92896326 Merge branch 'master' of github.com:hashicorp/terraform 2016-03-21 18:48:47 +00:00
stack72 9cfcfed499 Merge branch 'iceycake-issue-5592' 2016-03-21 18:48:32 +00:00
Andy Chan f7b85777d6 Added documentation for kms alias name_prefix 2016-03-21 18:48:15 +00:00
Paul Hinze 4cb13efe30 Merge pull request #5763 from hashicorp/phinze/traviscookie
travis: switch to unencrypted cookie
2016-03-21 13:48:10 -05:00
Andy Chan d6cd47fd5e Reformat the kms alias test code 2016-03-21 18:48:00 +00:00
Paul Hinze d38ee00039 travis: switch to unencrypted cookie
Otherwise rate limiting fix does not work for PRs from forks
2016-03-21 13:35:53 -05:00
James Nugent 910a7fca98 Update CHANGELOG.md 2016-03-21 18:23:03 +00:00
James Nugent f64854840c Update CHANGELOG.md 2016-03-21 18:20:48 +00:00
David Meyer f46a629d72 communicator/winrm: Fixed HTTPS when using copy client. 2016-03-21 18:20:48 +00:00
Clint f7ef36b86d Update CHANGELOG.md 2016-03-21 13:00:32 -05:00
Clint e62580e7e7 Update CHANGELOG.md 2016-03-21 12:59:53 -05:00
Clint f715c91666 Merge pull request #5756 from hashicorp/b-beanstalk-configuration-update
provider/aws: Fix crasher in Elastic Beanstalk Configuration with Options
2016-03-21 12:59:22 -05:00
Paul Hinze 74de2fa378 Merge pull request #5760 from uber/b-website-gcp-instance-group
Correct markdown for google_compute_instance_group and attach to index
2016-03-21 12:36:26 -05:00
Bill Fumerola 972aecdd84 Correct markdown for google_compute_instance_group and attach to index 2016-03-21 10:29:59 -07:00
James Nugent cb8a0549e1 Merge pull request #5757 from hashicorp/f-output-testing
Add TestCheckOutput helper to resource testing
2016-03-21 17:19:08 +00:00
Radek Simko cabece92e0 Update CHANGELOG.md 2016-03-21 17:08:56 +00:00
Radek Simko 5c21422f7d Merge pull request #5712 from bjss/master
Use timeout_in_minutes for Terraform timeout in AWS CloudFormation
2016-03-21 17:06:20 +00:00
Radek Simko 9a2ce8a207 Update CHANGELOG.md 2016-03-21 17:00:02 +00:00
Radek Simko b6e3788ad0 Merge pull request #5755 from TimeIncOSS/remove-notfound-err-helper
helper/resource: Remove NewNotFoundError function
2016-03-21 16:55:41 +00:00
James Nugent 35f9d2e081 Add TestCheckOutput helper to resource testing
This allows outputs in test configuration to have test functions written
conveniently. Useful for azurerm_template_deployment.
2016-03-21 16:54:02 +00:00
Radek Simko bf9f5879ca helper/resource: Remove NotFoundError function 2016-03-21 16:47:50 +00:00
James Nugent 3e055faf41 Update CHANGELOG.md 2016-03-21 16:47:47 +00:00
James Nugent f946695187 Merge pull request #5444 from TimeIncOSS/f-aws-logs-metric-filter
provider/aws: Add support for CloudWatch Log Metric Filter
2016-03-21 16:43:38 +00:00
clint shryock 9ae8e85640 provider/aws: Fix crasher in Elastic Beanstalk Configuration with option settings 2016-03-21 11:43:31 -05:00
Paul Hinze 26f4467966 Update CHANGELOG.md 2016-03-21 11:02:17 -05:00
Paul Hinze 6148229888 Merge pull request #5751 from hashicorp/phinze/fixup-remote-exec
provisioner/remote-exec: Move script cleanup after command wait
2016-03-21 11:01:29 -05:00