98167cea79
merging upstream master
2015-11-18 16:09:05 -07:00
fd251e8b45
rename TestAccAWSRoute53Record_weighted to TestAccAWSRoute53Record_weighted_basic to test in isolation
2015-11-18 16:08:23 -06:00
5024d66f3c
Merge pull request #3970 from hashicorp/b-aws-iam-policy-attachfix
...
providers/aws: Fix typo in error checking for IAM Policy Attachments
2015-11-18 13:57:03 -06:00
5482e98927
Fix typo in error checking for IAM Policy Attachments
2015-11-18 13:48:46 -06:00
a211fc3469
Merge pull request #3965 from hashicorp/b-aws-sg-rules-v2-race
...
provider/aws: serialize SG rule access to fix race condition
2015-11-18 12:47:55 -06:00
6b6b5a43c3
provider/aws: serialize SG rule access to fix race condition
...
Because `aws_security_group_rule` resources are an abstraction on top of
Security Groups, they must interact with the AWS Security Group APIs in
a pattern that often results in lots of parallel requests interacting
with the same security group.
We've found that this pattern can trigger race conditions resulting in
inconsistent behavior, including:
* Rules that report as created but don't actually exist on AWS's side
* Rules that show up in AWS but don't register as being created
locally, resulting in follow up attempts to authorize the rule
failing w/ Duplicate errors
Here, we introduce a per-SG mutex that must be held by any security
group before it is allowed to interact with AWS APIs. This protects the
space between `DescribeSecurityGroup` and `Authorize*` / `Revoke*`
calls, ensuring that no other rules interact with the SG during that
span.
The included test exposes the race by applying a security group with
lots of rules, which based on the dependency graph can all be handled in
parallel. This fails most of the time without the new locking behavior.
I've omitted the mutex from `Read`, since it is only called during the
Refresh walk when no changes are being made, meaning a bunch of parallel
`DescribeSecurityGroup` API calls should be consistent in that case.
2015-11-18 12:39:59 -06:00
815ff7ac63
Merge branch 'terraform' into hmrc
2015-11-18 17:56:28 +00:00
da8314ce8a
provider/aws: removed build-blocking unused variable.
2015-11-18 15:08:45 +02:00
b0fdf8a032
Fixed failing test
2015-11-18 12:54:18 +00:00
51a2fbd6ae
Merge pull request #3927 from jtopjian/jtopjian-openstack-lbvip-attr-cleanup
...
provider/openstack: Clean up some attributes in LBaaS VIP resource
2015-11-17 20:19:25 -07:00
306046b82b
Merge pull request #3955 from cbusbey/db_subnet_spaces
...
allow spaces in db subnet name
2015-11-17 22:38:36 +00:00
0bd8b32637
Merge pull request #3237 from GrayCoder/group-work
...
provider/aws: add support for group name and path changes with group update function
2015-11-17 16:37:40 -06:00
a5690b7510
removing debug print statements
2015-11-17 22:00:46 +00:00
12d51edeb6
allow spaces in db subnet name
2015-11-17 12:48:56 -08:00
29dfc4322e
Add retry calls to protect against api rate limiting
2015-11-17 17:27:39 +00:00
2ed867b5ab
Merge pull request #3945 from hashicorp/b-aws-r53-record-zone-fix
...
provider/aws: Fix crash in Route53 Record if Zone not found
2015-11-17 09:10:50 -06:00
edaaab9f62
Merge pull request #3948 from pshima/f-packet-net-provisioner-ip
...
Populate the provisioner connection info for packet.net devices
2015-11-17 13:26:10 +00:00
c8dfecc65f
Check where nested structs could possibly be nil before trying to access their data
2015-11-17 11:40:37 +00:00
f140c15039
Fixed null pointer panic during firewall rules test
2015-11-17 10:44:50 +00:00
cc54785b1c
Merge branch 'terraform' into hmrc
2015-11-17 10:13:53 +00:00
e2ef92f50f
Populate the provisioner connection info for packet.net devices with the ipv4 public address
2015-11-16 21:02:57 -08:00
6875e9aaec
Issue #3894 RDS publicly_accessible param shouldn't force new resource
...
Change-Id: I0a10e050ca1c4f2dde5e04f237de6115723522d8
2015-11-16 17:47:35 -08:00
7e59d7f67c
Merge pull request #3901 from hashicorp/phinze/google-credentials
...
provider/google: read credentials as contents instead of path
2015-11-16 17:57:54 -06:00
010293992a
Merge pull request #3899 from hashicorp/phinze/azure-publish-settings
...
provider/azure: read publish_settings as contents instead of path
2015-11-16 17:54:43 -06:00
fb0dc4951d
provider/azure: read publish_settings as contents instead of path
...
Building on the work in #3846 , shifting the Azure provider's
configuration option from `settings_file` to `publish_settings`.
2015-11-16 17:47:56 -06:00
00d0551933
aws: Add missing dereference operator
2015-11-16 23:19:45 +00:00
1413d032ee
provider/aws: Fix crash in Route53 Record if Zone not found
2015-11-16 17:15:17 -06:00
901e5fbf9f
fix log reference
2015-11-16 17:14:02 -06:00
8085e55eda
fix issue with undefined var
2015-11-16 16:29:52 -06:00
a8ceda1b15
Merge pull request #3914 from TimeIncOSS/b-aws-ecs-service-gone
...
provider/aws: Prevent crashing when deleting ecs_service which is gone
2015-11-16 21:46:06 +00:00
70f1c9c1e6
remove duplicate readInstance call
2015-11-16 15:16:41 -06:00
eb9a93862b
provider/google: read credentials as contents instead of path
...
Building on the work in #3846 , shifting the Google provider's
configuration option from `account_file` to `credentials`.
2015-11-16 15:14:32 -06:00
66ad974193
add acceptance test for spot instanace updates
2015-11-16 15:11:44 -06:00
f31b30d4a5
minor tweaks to connection info setup
2015-11-16 14:51:14 -06:00
993ec0a320
Merge pull request #3909 from hashicorp/phinze/template-file-contents
...
template_file: source contents instead of path
2015-11-16 14:50:45 -06:00
d998e883fb
providers/aws: Update Spot Instance request to provide connection information
2015-11-16 14:43:24 -06:00
ecc4ce3657
Converted firewall_rules rule set to a list type. Code tidy
2015-11-16 20:11:05 +00:00
afb416fba4
Merge pull request #2807 from dwradcliffe/f-dyn-provider
...
add Dyn provider
2015-11-16 13:53:44 -06:00
5c59bd95cb
Merge pull request #3924 from TimeIncOSS/b-aws-ecs-td-computed
...
provider/aws: Make all fields in ecs_task_definition ForceNew
2015-11-16 15:31:17 +00:00
309e697a52
provider/tls: add locally signed certificates
...
This allows you to generate and sign certificates using a local CA.
2015-11-15 20:23:40 -05:00
4f25b552bb
use single import path for aws-sdk-go
2015-11-16 00:42:08 +01:00
b4242e6f35
provider/openstack: Clean up some attributes in LBaaS VIP resource
...
This commit makes a few attributes computed so the generated information
is accessible after creation.
It also fixes the "persistence" attribute, which previously had a typo.
Finally, it converts "admin_state_up" to a Boolean to match the majority
of other attributes of the same name.
2015-11-14 21:16:23 +00:00
33ca2a796f
Fix typo (Modifier -> Modified)
2015-11-14 12:19:29 +00:00
308edd6dd7
provider/aws: Make all fields in ecs_task_definition ForceNew
...
- fixes https://github.com/hashicorp/terraform/issues/2694
2015-11-14 10:36:01 +00:00
aae8fc8494
provider/aws: Add acceptance test for bugfix for #2694
2015-11-14 10:34:17 +00:00
d5ae5ba062
Merge pull request #3910 from hashicorp/phinze/s3-object-homedir-expand
...
provider/aws: homedir expand in s3 object source
2015-11-14 09:35:09 +00:00
e7c88eab35
openstack: fix go vet error (bool modifier is %t)
2015-11-14 08:19:22 +00:00
19fc2193f4
Merge pull request #3904 from jtopjian/jtopjian-openstack-port-attr-cleanup
...
provider/openstack: Make Networking Port attributes more intuitive
2015-11-13 20:15:29 -07:00
f2a5064538
Merge pull request #3857 from jtopjian/jtopjian-openstack-secgroup-rule-fix2
...
provider/openstack: Security Group Rule fixes
2015-11-13 20:13:46 -07:00
0822776de0
provider/aws: If ecs_service isn't found during Read, delete it
2015-11-13 21:45:21 +00:00
d9a5de7f7d
provider/aws: Prevent crashing when deleting ecs_service which is gone
...
- fixes https://github.com/hashicorp/terraform/issues/3868
2015-11-13 21:42:29 +00:00
7d94c86958
go fmt structure files
2015-11-13 13:53:52 -06:00
50d36f108b
merging
2015-11-13 12:52:07 -07:00
ce6f0ae5e4
testing finished
2015-11-13 12:49:40 -07:00
6615285d63
working on read and more testing
2015-11-13 12:49:40 -07:00
8c47441a8b
adding new functional test
2015-11-13 12:49:06 -07:00
cae7fd8e4a
fixing if and AnyTypes
2015-11-13 12:47:17 -07:00
b47d1cda7c
adding capability to set custom configuration value in virtual machines
2015-11-13 12:47:17 -07:00
0f46b3a6c5
working on read and more testing
2015-11-13 12:43:06 -07:00
728b2bed63
adding new functional test
2015-11-13 12:43:06 -07:00
bc36ba7f3c
fixing if and AnyTypes
2015-11-13 12:43:06 -07:00
e899a2949f
adding capability to set custom configuration value in virtual machines
2015-11-13 12:43:06 -07:00
bf88ee8ddb
fix test to include creation of placement group
2015-11-13 12:40:19 -06:00
928f534cfc
template_file: source contents instead of path
...
Building on the work of #3846 , deprecate `filename` in favor of a
`template` attribute that accepts file contents instead of a path.
Required a bit of work in the interpolation code to prevent Terraform
from assuming that template interpolations were resource variables that
needed to be resolved. Leaving them as "Unknown Variables" prevents
interpolation from happening early and lets the `template_file` resource
do its thing.
2015-11-13 11:24:20 -06:00
44f259bd74
provider/aws: homedir expand in s3 object source
...
fixes #3856
2015-11-13 11:21:22 -06:00
e94fcdb9df
add validation for cookie stickiness
2015-11-13 10:46:27 -06:00
b81f9a9c52
provider/aws: Fix issue with LB Cookie Stickiness and empty expiration period
2015-11-13 10:34:15 -06:00
edd8e722bf
provider/openstack: Make Networking Port attributes more intuitive
...
This commit makes some quick updates to the port attributes to make them
more intuitive:
* `security_groups` to `security_group_ids`: since the port is expecting
IDs and not security group names like in other areas of OpenStack.
* `admin_state_up`: change to Boolean to match this same attribute on
other resources.
* `fixed_ips` to `fixed_ip`: while multiple `fixed_ip` blocks can be
specified, only one fixed IP can be specified in each block.
2015-11-13 04:46:12 +00:00
4d6e3289bc
provider/openstack: adding test for router interface port
2015-11-13 04:04:05 +00:00
3a1a242a7a
provider/openstack: Allow port_id for router interface
2015-11-13 03:13:12 +00:00
839fc5bfee
Merge pull request #3900 from Banno/fix-aws-route53-record-failover-weight
...
provider/aws: fix for creating failover route53 records
2015-11-12 16:56:59 -06:00
6fa69ede1c
add debugging statements to add/remove listeners
2015-11-12 16:20:54 -06:00
10ca0559ae
provider/aws: no weight for all set_identifier
2015-11-12 16:15:05 -06:00
c60a963908
providers/aws: Retry deleting IAM Server Cert on dependency violation
...
This will retry deleting a server cert
if it throws an error about being in use with an ELB (that we've likely just
deleted)
Includes test for ELB+IAM SSL cert bug dependency violation
2015-11-12 16:07:34 -06:00
b6738f13c1
Issue #3894 RDS publicly_accessible param shouldn't force new resource
...
Change-Id: I833f9e07f3fc1f6ee475673ad978b3982f0b6273
2015-11-12 13:33:27 -08:00
5cafe740ff
update wording on ssl cert error
2015-11-12 14:25:50 -06:00
1b2e068b19
add extra test block
2015-11-12 14:25:50 -06:00
fddafd2b96
providers/aws: Document and validate ELB ssl_cert and protocol requirements
2015-11-12 14:25:50 -06:00
dcf40661c8
Merge pull request #3863 from hashicorp/b-aws-elb-access-fix
...
providers/aws: Fix issue with removing access_logs from ELB
2015-11-12 14:24:58 -06:00
12d2ae1438
patch TestExpandElasticacheParameters test
2015-11-12 10:45:49 -06:00
e7e52ed98f
Correct test method names so that they are ran
2015-11-12 10:36:22 -06:00
cbbe06388f
Merge pull request #3883 from lwander/f-gcp-https-health-checks
...
provider/google: HTTPS Health Checks Resource + Tests & Documentation
2015-11-12 10:02:39 -06:00
28819603ba
provider/google: HTTPS health checks resource + tests & documentation
2015-11-12 10:48:26 -05:00
90d70786ac
Align IAM version number to the current version (2012-10-17)
2015-11-13 00:32:45 +09:00
3db7922b53
provider/openstack: Security Group Rule fixes
...
This commit fixes an issue with security group rules where the rules
were not being correctly computed due to a typo in the rule map.
Once rules were successfully computed, the rules then needed to be
converted into a Set so they can be correctly ordered.
2015-11-12 03:15:52 +00:00
15a568c806
Merge pull request #3828 from TimeIncOSS/b-aws-ecs-service-del
...
provider/aws: Treat ecs_service w/ Status==INACTIVE as deleted
2015-11-12 00:01:50 +00:00
bcd63f62a3
provider/aws: Log removal of INACTIVE ECS service
2015-11-11 23:53:59 +00:00
54b103b9c7
testing finished
2015-11-11 22:42:36 +00:00
7f2244183c
providers/aws: Fix issue with removing access_logs from ELB
2015-11-11 15:25:24 -06:00
0bf8ffd043
working on read and more testing
2015-11-11 18:43:47 +00:00
106b126448
adding new functional test
2015-11-11 18:43:47 +00:00
6e19c3f0e0
fixing if and AnyTypes
2015-11-11 18:43:47 +00:00
3f37884721
adding capability to set custom configuration value in virtual machines
2015-11-11 18:43:47 +00:00
b51f425dac
replace big retry func with resource.Retry
2015-11-11 10:53:23 -06:00
1ddfd7ced3
provider/aws: Add a retry function to rescue an error in creating Lifecycle Hooks
2015-11-11 10:25:23 -06:00
caa0baaf87
Merge pull request #3756 from hashicorp/pr-3708
...
providers/aws: Add `access_logs` to ELB resource [GH-3756]
2015-11-11 09:54:43 -06:00
dda6973c0a
Merge pull request #3677 from hashicorp/pr-2637
...
provider/aws: Add AutoMinorVersionUpgrade to RDS [GH-3677]
2015-11-11 09:48:24 -06:00
f79af0a445
Merge pull request #3847 from betawaffle/master
...
Add queued as a pending state for Packet provider.
2015-11-11 10:41:00 -05:00
03e7c6cf12
default true for auto_minor_update and allow updates for RDS DB Instance
2015-11-11 09:36:37 -06:00
7dd6b779ca
Add AutoMinorVersionUpgrade to RDS.
2015-11-11 09:35:53 -06:00
dc8924b537
Changed vcd_vapp resource to make better use of Update function
2015-11-10 23:35:25 +00:00
ac6efd86ed
Merge pull request #3810 from TimeIncOSS/f-aws-ecs-ephemeral-volumes
...
provider/aws: Support scratch volumes in ecs_task_definition
2015-11-10 23:22:22 +00:00
8c32536f3d
return err if we fail to set access_logs; other cleanups
2015-11-10 16:58:24 -06:00
0a1890c329
Merge branch 'master' into pr-3708
...
* master: (95 commits)
Update CHANGELOG.md
Update CHANGELOG.md
Update CHANGELOG.md
Update CHANGELOG.md
upgrade a warning to error
add some logging around create/update requests for IAM user
Update CHANGELOG.md
Update CHANGELOG.md
Build using `make test` on Travis CI
Update CHANGELOG.md
provider/aws: Fix error format in Kinesis Firehose
Update CHANGELOG.md
Changes to Aws Kinesis Firehouse Docs
Update CHANGELOG.md
modify aws_iam_user_test to correctly check username and path for initial and changed username/path
Update CHANGELOG.md
Update CHANGELOG.md
Prompt for input variables before context validate
Removing the AWS DBInstance Acceptance Test for withoutEngine as this is now part of the checkInstanceAttributes func
Making engine_version be computed in the db_instance provider
...
2015-11-10 16:52:45 -06:00
68764e6def
Merge pull request #3777 from hashicorp/pr-3751
...
provider/aws: fix panic with SNS topic policy if omitted
2015-11-10 16:45:42 -06:00
9e93f655e2
Merge pull request #3829 from hashicorp/b-aws-ecs-cluster-read
...
provider/aws: Fix issue that could occur if no ECS Cluster was found for a give name
2015-11-10 16:43:42 -06:00
dbc008e330
Merge pull request #3574 from hashicorp/b-aws-r53-name-fix
...
provider/aws: Downcase Route 53 record names in statefile
2015-11-10 16:41:40 -06:00
bea8e0b14f
Merge pull request #3780 from hashicorp/b-aws-elb-source-sg-id
...
providers/aws: Provide source security group id for ELBs
2015-11-10 16:38:55 -06:00
7152674f9b
upgrade a warning to error
2015-11-10 16:27:41 -06:00
b16b634e2b
add some logging around create/update requests for IAM user
2015-11-10 16:19:15 -06:00
8b1f7498af
Merge pull request #3227 from GrayCoder/master
...
provider/aws Implement username updates properly for aws-sdk-go
2015-11-10 16:17:07 -06:00
06d493cfb6
Merge pull request #3849 from hashicorp/b-fix-kinesis-firehose-vet
...
provider/aws: Fix error format in Kinesis Firehose
2015-11-10 16:55:53 -05:00
51fd5fafef
Merge pull request #3744 from stack72/f-aws-db-instance
...
provider/aws: Changing the db_instance resource to mark the engine_version as Optional
2015-11-10 15:48:06 -06:00
b48bd30227
provider/aws: Fix error format in Kinesis Firehose
2015-11-10 16:39:23 -05:00
7c50e3ed65
Merge pull request #3833 from stack72/aws-kinesis-firehose
...
provider/aws: Add Kinesis Firehose resource
2015-11-10 16:04:48 -05:00
5708457610
Merge pull request #3802 from pforman/2911-lc-prefix
...
provider/aws: add name_prefix option to launch config
2015-11-10 14:43:08 -06:00
2962305125
Add queued as a pending state for Packet provider.
2015-11-10 15:38:08 -05:00
eadee6bd33
modify aws_iam_user_test to correctly check username and path for initial and changed username/path
2015-11-10 15:24:45 -05:00
32df5c05bf
Merge pull request #3827 from TimeIncOSS/b-aws-iam-saml-arn
...
provider/aws: Set previously missing ARN in iam_saml_provider
2015-11-10 14:20:25 -06:00
a15c99e5bb
Code cleanup to address PR comments
2015-11-10 18:39:58 +00:00
6e21cd746e
Removing the AWS DBInstance Acceptance Test for withoutEngine as this is now part of the checkInstanceAttributes func
2015-11-10 17:35:12 +00:00
e3a66d0928
Making engine_version be computed in the db_instance provider
2015-11-10 17:30:19 +00:00
1abb0b19bf
Changing the db_instance resource to mark the engine_version as Optional
2015-11-10 17:30:09 +00:00
0d69159fc5
Merge pull request #3804 from kenshiro-o/add_gce_pubsub_auth_endpoint
...
providers/google: add pubsub auth endpoint
2015-11-10 11:27:34 -05:00
d14d891367
Finishing the first pass at Kinesis Firehose. I have only implemented the S3 configuration right now as Terraform doesn't include RedShift support
2015-11-10 16:24:33 +00:00
4fc60c9f89
docker: improve validation of runtime constraints
2015-11-09 19:36:23 -05:00
5dfa9ac823
Adding the shell for the acceptance tests for the AWS Kinesis Firehose work
2015-11-09 22:44:26 +00:00
fc983c5505
Initial Create, Read and Delete work for the S3 part of the Kinesis Firehose resource
2015-11-09 22:26:55 +00:00
2694022b4a
Fix a panic that could occur if no ECS Cluster was found for a given cluster name
2015-11-09 14:33:20 -06:00
9683896480
provider/aws: Treat ecs_service w/ Status==INACTIVE as deleted
...
- fixes https://github.com/hashicorp/terraform/issues/3582
2015-11-09 20:46:05 +01:00
cf5cfdbff0
provider/aws: Set previously missing ARN in iam_saml_provider
...
- fixes https://github.com/hashicorp/terraform/issues/3820
2015-11-09 20:26:23 +01:00
29636dc51d
provider/openstack: Revert Security Group Rule Fix
...
This commit reverts the patch from #3796 .
It has been discovered that multiple rules are being reported out
of order when the configuration is applied multiple times. I feel
this is a larger issue than the bug this patch originally fixed,
so until I can resolve it, I am reverting the patch.
2015-11-09 17:31:40 +00:00
63049c0176
provider/aws: Support scratch volumes in ecs_task_definition
2015-11-08 20:31:34 +01:00
37d4316c13
Merge pull request #3801 from jtopjian/jtopjian-openstack-secgroup-computed
...
provider/openstack: Make Security Groups Computed
2015-11-07 12:31:15 -07:00
1bb26a4cc2
Merge pull request #3796 from jtopjian/jtopjian-openstack-secgroup-rule-fix
...
provider/openstack: Security Group Rules Fix
2015-11-07 12:29:53 -07:00
ad1c28990c
providers/google: add pubsub auth endpoint #3803
2015-11-07 14:05:03 +00:00
4d640c6528
providers/aws: add name_prefix option to launch config
...
See #2911 .
This adds a `name_prefix` option to `aws_launch_configuration` resources.
When specified, it is used instead of `terraform-` as the prefix for the
launch configuration. It conflicts with `name`, so existing
functionality is unchanged. `name` still sets the name explicitly.
Added an acceptance test, and updated the site documentation.
2015-11-07 01:29:16 -07:00
98a441314b
provider/openstack: Make Security Groups Computed
...
This commit makes security groups in the openstack_compute_instance_v2
resource computed. This fixes issues where a security group is omitted
which causes the instance to have the "default" group applied. When
re-applying without this patch, an error will occur.
2015-11-07 04:01:50 +00:00
d6f6a3b3f5
Merge branch 'master' of github.com:hashicorp/terraform
...
* 'master' of github.com:hashicorp/terraform:
Update CHANGELOG.md
Adding S3 support for Lambda provider
2015-11-06 16:55:32 -06:00
ccd37796ec
Merge branch 'pr-3707'
...
* pr-3707:
config updates for ElastiCache test
Removing the instance_type check in the ElastiCache cluster creation. We now allow the error to bubble up to the userr when the wrong instance type is used. The limitation for t2 instance types now allowing snapshotting is also now documented
Making the changes to the snapshotting for Elasticache Redis as per @catsby's findings
Added an extra test for the Elasticache Cluster to show that updates work. Also added some debugging to show that the API returns the Elasticache retention period info
When I was setting the update parameters for the Snapshotting, I didn't update the copy/pasted params
Adding the ability to specify a snapshot window and retention limit for Redis ElastiCache clusters
2015-11-06 16:55:16 -06:00
dbd2a43f46
config updates for ElastiCache test
2015-11-06 16:55:04 -06:00
327bd4f9c0
Adding S3 support for Lambda provider
2015-11-06 15:57:18 -06:00
0e9397fc74
provider/openstack: Security Group Rules Fix
...
This commit fixes how security group rules are read by Terraform and
enables them to be correctly removed when the rule resource is
modified.
2015-11-06 21:52:30 +00:00
15533dca09
actually use the value
2015-11-06 14:06:50 -06:00
4c1083c9c5
provider/openstack: fix test formatting
2015-11-06 17:32:30 +00:00
1656e2837c
Merge pull request #3772 from Fodoj/add-fixed-ips-to-openstack-ports
...
provider/openstack: Add fixed ips to openstack ports
2015-11-06 10:21:20 -07:00
c905bfef22
Test source_security_group_id for ELBs
2015-11-06 11:18:57 -06:00
b6abb91b83
Class a resource that is in tfstate but unable to be found on the provider as deleted
2015-11-06 16:39:40 +00:00
350f91ec06
Removing the instance_type check in the ElastiCache cluster creation. We now allow the error to bubble up to the userr when the wrong instance type is used. The limitation for t2 instance types now allowing snapshotting is also now documented
2015-11-06 11:16:51 +00:00
bda4ef7e7c
Merge branch 'terraform' into hmrc
2015-11-06 10:22:25 +00:00
chrislovecnm