From c48b0a5e188580a67663f87f1c19aa4221395e16 Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Sat, 12 Dec 2015 05:12:05 -0800
Subject: [PATCH] etcdmain: fix shadowed variables

Fix for https://github.com/coreos/etcd/issues/3954.
---
 etcdmain/etcd.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
index d47d87e1e..ff47b34e5 100644
--- a/etcdmain/etcd.go
+++ b/etcdmain/etcd.go
@@ -363,7 +363,7 @@ func startProxy(cfg *config) error {
 			plog.Warningf("discovery token ignored since the proxy has already been initialized. Valid cluster file found at %q", clusterfile)
 		}
 		urls := struct{ PeerURLs []string }{}
-		err := json.Unmarshal(b, &urls)
+		err = json.Unmarshal(b, &urls)
 		if err != nil {
 			return err
 		}