From 5e8b300ca1369cb04ca4cee8d493f41bd01e395c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 14 Jan 2015 09:29:37 -0800
Subject: [PATCH] update CHANGELOG

---
 CHANGELOG.md            | 2 ++
 helper/schema/schema.go | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 496e33fc2..c2551d651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ IMPROVEMENTS:
 BUG FIXES:
 
  * core: Fixing use of remote state with plan files. [GH-741]
+ * core: Fix a panic case when certain invalid types were used in
+     the configuration. [GH-691]
 
 PLUGIN CHANGES:
 
diff --git a/helper/schema/schema.go b/helper/schema/schema.go
index f334dc2a4..e476e8039 100644
--- a/helper/schema/schema.go
+++ b/helper/schema/schema.go
@@ -915,7 +915,7 @@ func (m schemaMap) validateList(
 	rawV := reflect.ValueOf(raw)
 	if rawV.Kind() != reflect.Slice {
 		return nil, []error{fmt.Errorf(
-			"%s: should be an array", k)}
+			"%s: should be a list", k)}
 	}
 
 	// Now build the []interface{}