Merge 904e83b into c0af22f

tikv · Oct 22, 2016 · 46c44f1 · 46c44f1
2 parents c0af22f + 904e83b
commit 46c44f1
Show file tree

Hide file tree

Showing 4 changed files with 146 additions and 57 deletions.
diff --git a/Makefile b/Makefile
@@ -62,7 +62,7 @@ endif
 update:
 	which glide >/dev/null || curl https://glide.sh/get | sh
 	which glide-vc || go get -v -u github.com/sgotti/glide-vc
-	rm -r vendor && mv _vendor/vendor vendor || true
+	rm -rf vendor && mv _vendor/vendor vendor || true
 	rm -rf _vendor
 ifdef PKG
 	glide get --strip-vendor --skip-test ${PKG}

diff --git a/_vendor/vendor/github.com/google/btree/btree.go b/_vendor/vendor/github.com/google/btree/btree.go
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -92,7 +92,7 @@ import:
   - jsonpb
   - proto
 - package: github.com/google/btree
-  version: 7d79101e329e5a3adf994758c578dab82b90c017
+  version: 925471ac9e2131377a91e1595defec898166fe49
 - package: github.com/gorilla/context
   version: ~1.1.0
 - package: github.com/gorilla/mux