Merge pull request #119 from qianbin/deps

deps: update goleveldb to fix 1T panic; add github.com/gorilla/websocket
vechain · Aug 24, 2018 · 953d4ae · 953d4ae
2 parents c6c3563 + 84e52ec
commit 953d4ae
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "vendor"]
 	path = vendor
 	url = https://github.com/vechain/thor-go-vendor
-	branch = 180613
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -73,3 +73,7 @@ ignored = []
 [[constraint]]
   name = "github.com/beevik/ntp"
   version = "0.2.0"
+
+[[constraint]]
+  name = "github.com/gorilla/websocket"
+  version = "1.3.0"
diff --git a/vendor b/vendor