Mitchell Hashimoto
4184570cbd
Merge pull request #1322 from hashicorp/f-state-backwards
...
command: when setting up state, only write back if local is newer
2015-03-26 17:21:16 -07:00
Seth Vargo
1adb3fbfa0
command: when setting up state, only write back if local is newer
2015-03-26 17:16:54 -07:00
Clint
340863b6cc
Merge pull request #1312 from hashicorp/f-aws-s3-tags
...
provider/aws: Add tags to S3
2015-03-26 15:15:54 -05:00
Clint
1b22f206fb
Merge pull request #1279 from hashicorp/b-route53-record-fixes
...
provider/aws: Cleanup Route 53 subdomain name handling
2015-03-26 15:15:31 -05:00
Clint
affdd1f42a
Merge pull request #1319 from hashicorp/f-aws-asg-tags-support
...
Add tagging support for AWS ASG (cont. 1080)
2015-03-26 15:11:22 -05:00
Clint Shryock
deda59b50e
minor code cleanups to get acceptance tests passing
2015-03-26 14:49:15 -05:00
Clint Shryock
877eb902a0
Merge branch 'master' into time-asg-tags-support
...
* master:
update CHANGELOG
providers/digitalocean: add dot in GET response
providers/digitalocean: force fqdn in dns rr value
update CHANGELOG
Add disk size to google_compute_instance disk blocks.
'project' should be set to the project's ID, not its name.
Don't error when enabling DNS hostnames in a VPC
Correct AWS VPC or route table read functions
Updates to GCE Instances and Instance Templates to allow for false values to be set for the auto_delete setting.
Update GCE Instance Template tests now that existing disk must exist prior to template creation.
Update Google API import to point to the new location.
add network field to the network_interface
2015-03-26 13:47:46 -05:00
Paul Hinze
f51fb5e127
providers/aws: handle empty instancestate in state migration
...
fixes #1309
2015-03-26 13:07:04 -05:00
Mitchell Hashimoto
e0df2a948c
update CHANGELOG
2015-03-26 10:58:42 -07:00
Anton Tereshchenkov
6f76340192
providers/digitalocean: add dot in GET response
...
Added tests for relative and external CNAME values.
2015-03-26 10:57:46 -07:00
Anton Tereshchenkov
3565ae034e
providers/digitalocean: force fqdn in dns rr value
...
Fixes a bug that forces DNS record to be recreated when dealing with
records that have domain values (CNAME, MX, NS, etc.)
2015-03-26 10:57:46 -07:00
Mitchell Hashimoto
c294ce323c
Merge pull request #1272 from ndarilek/google-instance-docs-fix
...
website: 'project' requires ID, not name
2015-03-26 10:21:12 -07:00
Mitchell Hashimoto
5e7007e38f
Merge pull request #1239 from BashtonLtd/gce_fix_false_bools
...
providers/google: Updates to GCE Instances and Instance Templates to allow for false bools.
2015-03-26 10:20:52 -07:00
Mitchell Hashimoto
591376f88d
Merge pull request #1238 from BashtonLtd/gce_update_instance_template_disk_tests
...
providers/google: Update GCE Instance Template tests now that existing disk must exist first.
2015-03-26 10:20:29 -07:00
Mitchell Hashimoto
266670c1a1
Merge pull request #1154 from stuntgoat/gce-add-network
...
providers/google: add network field to the network_interface
2015-03-26 10:19:00 -07:00
Mitchell Hashimoto
f0a78bbb3e
Merge branch 'bitglue-vpc_missing'
2015-03-26 10:17:21 -07:00
Mitchell Hashimoto
944ff16d4e
Merge branch 'vpc_missing' of https://github.com/bitglue/terraform into bitglue-vpc_missing
...
Conflicts:
builtin/providers/aws/resource_aws_vpc.go
2015-03-26 10:17:14 -07:00
Mitchell Hashimoto
d21c112593
Merge pull request #1236 from BashtonLtd/gce_update_imports
...
Update Google API import to point to the new location.
2015-03-26 10:14:33 -07:00
Mitchell Hashimoto
5e8535c5e0
update CHANGELOG
2015-03-26 10:13:57 -07:00
Mitchell Hashimoto
deb5052454
Merge pull request #1284 from ndarilek/add-size-to-instance-disk
...
Add size option to disk blocks under google_compute_instance
2015-03-26 10:13:11 -07:00
Clint Shryock
1b699aae7d
small code cleanup
2015-03-26 11:58:20 -05:00
Mitchell Hashimoto
e5a375ae58
providers/heroku: empty config vars block shouldn't panic [GH-1211]
2015-03-26 09:45:37 -07:00
Clint Shryock
be60d39b24
Add proper reading/updating of tags for S3
2015-03-26 11:45:16 -05:00
Mitchell Hashimoto
44fce5ce60
config/module: remove debug
2015-03-26 09:31:58 -07:00
Mitchell Hashimoto
2e11ca68df
config/module: go back to the original folder when doing parent
...
references
2015-03-26 09:30:32 -07:00
Clint Shryock
c6d832333b
provider/aws: Add tags to S3
2015-03-26 11:19:42 -05:00
Mitchell Hashimoto
bd4aaac71a
config/module: failing unit test for GH-1232
2015-03-26 09:11:32 -07:00
Radek Simko
7950ace399
Documentation for ASG Tags added
2015-03-26 07:35:16 +00:00
Radek Simko
fff05e2aad
Tags support added for AWS ASG
2015-03-26 07:35:15 +00:00
Mitchell Hashimoto
19c7f8cff4
Merge pull request #1307 from hashicorp/b-provider-config-merge
...
terraform: merge provider configs before validate [GH-1282]
2015-03-25 16:54:53 -07:00
Mitchell Hashimoto
8f11118840
Merge pull request #1308 from hashicorp/b-nil-state-output
...
command/output: don't panic if no root module in state [GH-1263]
2015-03-25 16:54:46 -07:00
Mitchell Hashimoto
83cb277583
command/output: don't panic if no root module in state [GH-1263]
2015-03-25 16:35:27 -07:00
Mitchell Hashimoto
27f4f5889b
website: clarify docs on -var-file and terraform.tfvars [GH-1280]
2015-03-25 16:31:22 -07:00
Mitchell Hashimoto
a0839da71a
terraform: merge provider configs before validate [GH-1282]
2015-03-25 16:28:52 -07:00
Mitchell Hashimoto
1bbfb07b00
Merge pull request #1306 from hashicorp/b-state-serial-inc
...
terraform: don't increment state if one is nil
2015-03-25 15:55:58 -07:00
Mitchell Hashimoto
9c6e2cdc21
terraform: make sure our serial is always higher
2015-03-25 15:40:53 -07:00
Mitchell Hashimoto
f68f285f72
terraform: test case for higher S1 serial
2015-03-25 15:39:33 -07:00
Mitchell Hashimoto
0d4c7887c5
terraform: don't increment state if one is nil
2015-03-25 15:38:24 -07:00
Mitchell Hashimoto
431f5e6706
command/remote-config: syntax
2015-03-25 15:26:38 -07:00
Mitchell Hashimoto
2796f83950
command/remote-config: make the error message nicer for remote init
...
/cc @sethvargo - based on UX issues you ran into yesterday
2015-03-25 15:23:04 -07:00
Sander van Harmelen
26fa9b6daa
Merge pull request #1305 from svanharmelen/b-provider/cloudstack-template
...
provider/cloudstack: some small fixes, needed to work with bigger templates
2015-03-25 22:56:37 +01:00
Sander van Harmelen
041cce36b4
Some small fixes, needed to work with bigger templates
2015-03-25 22:48:44 +01:00
Paul Hinze
396b082c20
Merge pull request #1304 from hashicorp/b-aws-vpc-modify-attr-req
...
providers/aws: fix DNS options on VPC
2015-03-25 16:24:13 -05:00
Paul Hinze
cddb057f40
providers/aws: fix DNS options on VPC
...
One typo on a `d.Get` and reuse of the request object was making it sad.
Now it is happy!
fixes #1301
2015-03-25 15:15:32 -05:00
Paul Hinze
6b02cfb700
Merge pull request #1277 from hashicorp/f-aws-derive-root-device-name
...
providers/aws: derive instance root_block_device name
2015-03-25 15:15:05 -05:00
Paul Hinze
b90be254d7
Merge pull request #1290 from spenczar/minor-doc-update
...
Bring usage docs up to date
2015-03-25 11:18:33 -05:00
Clint
393f335e48
Merge pull request #1289 from hashicorp/f-aws-elb-tags
...
provider/aws: Add tag support to ELB
2015-03-25 09:46:49 -05:00
Mitchell Hashimoto
28ecdacdf9
Merge pull request #1294 from hashicorp/f-push
...
command/push: for remote TF configuration runs
2015-03-24 17:55:40 -07:00
Mitchell Hashimoto
280635d2b0
command/push: add -atlas-address
2015-03-24 17:45:19 -07:00
Mitchell Hashimoto
51614b6365
command/push: upload-modules
2015-03-24 17:42:40 -07:00