From 50aca2eebe2ecb7aa62b46eb5c6e334652f907d1 Mon Sep 17 00:00:00 2001
From: Dan Gillespie <dan@redspread.com>
Date: Wed, 4 May 2016 02:24:07 -0700
Subject: [PATCH] updated .gitignore and added comment explaining vendoring
 patch

---
 .gitignore | 1 -
 godep.sh   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index fe43e36682..db31ab7e32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,5 +23,4 @@ _testmain.go
 *.test
 *.prof
 
-/minikube
 /out
diff --git a/godep.sh b/godep.sh
index 9e564fd6ae..3d7eb90e19 100755
--- a/godep.sh
+++ b/godep.sh
@@ -25,6 +25,8 @@ rm -rf Godeps vendor
 GO15VENDOREXPERIMENT="1" godep save -v ./...
 
 # apply patch to golang.org/x/net/trace/trace.go
+# Comments out init block to prevent a panic caused by trying to register an HTTP
+# route which has been registered by a copy of the same packaged vendored by etcd.
 patch vendor/golang.org/x/net/trace/trace.go - <<EOF
 109a110
 > 	/*