8 Commits (1e2da4f776bdf74058154ed31c4cd62b052d3f2d)

Author	SHA1	Message	Date
Martin Atkins	8cd0ee80e5	config: merge/append for local values ... It seems that this somehow got lost in the commit/rebase shuffle and wasn't caught by the tests that _did_ make it because they were all using just one file. As a result of this bug, locals would fail to work correctly in any configuration with more than one .tf file. Along with restoring the append/merge behavior, this also reworks some of the tests to exercise the multi-file case as better insurance against regressions of this sort in future. This fixes #15969.	9 years ago
James Bardin	bcbcc65f7d	add terraform config merge logic to config.Merge	9 years ago
James Bardin	b38e620b2f	merge config.Terraform fields in config.Append ... Ensure that fields set in an earlier Terraform config block aren't removed by Append when encountering another Terraform block. When multiple blocks contain the same field, the later one still wins.	9 years ago
Mitchell Hashimoto	c2c5668a8d	config: Append supports `terraform`	9 years ago
Panagiotis Moustafellos	e4845f75cc	removed extra parentheses	11 years ago
Mitchell Hashimoto	fdded8ca14	config: allow atlas block	11 years ago
Mitchell Hashimoto	e7fe5aa452	config: Append works with modules	12 years ago
Mitchell Hashimoto	69b7bc5047	config: add Append function	12 years ago