From fd3f5e34d7bb778b27ee9b07a9062a8347de85d2 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 12 Dec 2016 10:52:14 -0800 Subject: [PATCH] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fab5e9380..13fc581819 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ FEATURES: IMPROVEMENTS: + * core: Maps across multiple input sources (files, CLI, env vars) are merged. [GH-10654] * command/plan: Show warning when a plan file is given as input to make behavior clear. [GH-10639] * provider/aws: Add support for AWS CA Central 1 Region [GH-10618] * provider/aws: Added SQS FIFO queues [GH-10614]