From 161d1e8489f25731d4fbfe305170d2a887bd3c89 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 10 Apr 2015 16:45:56 -0700
Subject: [PATCH] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9da6c77cc..595b94c17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ BUG FIXES:
 
   * core: refresh won't remove outputs from state file [GH-1369]
   * core: clarify "unknown variable" error [GH-1480]
+  * core: properly merge parent provider configs when asking for input
   * provider/aws: fix panic possibility if RDS DB name is empty [GH-1460]
   * provider/aws: fix issue detecting credentials for some resources [GH-1470]
   * provider/google: fix issue causing unresolvable diffs when using legacy