From 07d28f8eb5711aff8b4a310027a2a62b56852e94 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Wed, 27 Nov 2013 10:45:19 -0600
Subject: [PATCH 1/2] Type assertions not needed with convey.

---
 config/config_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/config_test.go b/config/config_test.go
index 9357d3bcc..0e51805ae 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -12,15 +12,15 @@ func TestConfig(t *testing.T) {
 		t.Fatal("Error setting PILOSA_CONFIG")
 	}
 	Convey("config.Get()", t, func() {
-		So(Get("port_tcp").(int), ShouldEqual, 12000)
-		So(Get("port_http").(int), ShouldEqual, 15000)
-		So(Get("temp").(string), ShouldEqual, "/tmp")
+		So(Get("port_tcp"), ShouldEqual, 12000)
+		So(Get("port_http"), ShouldEqual, 15000)
+		So(Get("temp"), ShouldEqual, "/tmp")
 		So(Get("notfound"), ShouldBeNil)
 	})
 	Convey("config.GetSafe()", t, func() {
 		val, ok := GetSafe("port_tcp")
 		So(ok, ShouldBeTrue)
-		So(val.(int), ShouldEqual, 12000)
+		So(val, ShouldEqual, 12000)
 		val, ok = GetSafe("derp")
 		So(ok, ShouldBeFalse)
 		So(val, ShouldBeNil)

From 6820afd4be78ef5c1d6ba0c9a9856533bf55f290 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Tue, 3 Dec 2013 16:25:34 -0600
Subject: [PATCH 2/2] Change version of go-etcd.

---
 deps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps.json b/deps.json
index 73952003b..8df70badd 100644
--- a/deps.json
+++ b/deps.json
@@ -6,7 +6,7 @@
     },
     "etcd": {
         "repo": "github.com/coreos/go-etcd/etcd",
-        "version": "8a44ce0c654efd505418bb2c341cb9b797020583",
+        "version": "8a4461a676eb65fb74f10da1f8198cc9f67da366",
         "type": "git"
     },
     "goconvey": {