From 6448e0c25d7133e86080200e0fb5ace442323385 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Mon, 16 Apr 2018 00:38:49 -0700
Subject: [PATCH] update glide

---
 weed/glide.lock | 93 -------------------------------------------------
 weed/glide.yaml | 39 +++++++++++++++------
 2 files changed, 28 insertions(+), 104 deletions(-)
 delete mode 100644 weed/glide.lock

diff --git a/weed/glide.lock b/weed/glide.lock
deleted file mode 100644
index bfc301403..000000000
--- a/weed/glide.lock
+++ /dev/null
@@ -1,93 +0,0 @@
-hash: fc2f4ccfa5d703b62b9c93047bae2295e6926ce1603c2164510c9010ff829945
-updated: 2016-06-24T14:19:43.337337605-07:00
-imports:
-- name: bazil.org/fuse
-  version: 9e8e65293a037ce998ba0df102710c49313aa513
-  subpackages:
-  - fs
-  - fuseutil
-- name: github.com/boltdb/bolt
-  version: 3f7947a25d970e1e5f512276c14d5dcf731ccd5e
-- name: github.com/chrislusf/raft
-  version: 5f7ddd8f479583daf05879d3d3b174aa202c8fb7
-  subpackages:
-  - protobuf
-- name: github.com/dgrijalva/jwt-go
-  version: f0777076321ab64f6efc15a82d9d23b98539b943
-- name: github.com/disintegration/imaging
-  version: d8bbae1de109b518dabc98c6c1633eb358c148a4
-- name: github.com/gocql/gocql
-  version: b7b8a0e04b0cb0ca0b379421c58ec6fab9939b85
-  subpackages:
-  - internal/lru
-  - internal/murmur
-  - internal/streams
-- name: github.com/gogo/protobuf
-  version: 2752d97bbd91927dd1c43296dbf8700e50e2708c
-  subpackages:
-  - proto
-- name: github.com/golang/protobuf
-  version: 0c1f6d65b5a189c2250d10e71a5506f06f9fa0a0
-  subpackages:
-  - proto
-- name: github.com/golang/snappy
-  version: d9eb7a3d35ec988b8585d4a0068e462c27d28380
-- name: github.com/gorilla/context
-  version: aed02d124ae4a0e94fea4541c8effd05bf0c8296
-- name: github.com/gorilla/mux
-  version: 9fa818a44c2bf1396a17f9d5a3c0f6dd39d2ff8e
-- name: github.com/hailocab/go-hostpool
-  version: e80d13ce29ede4452c43dea11e79b9bc8a15b478
-- name: github.com/hashicorp/golang-lru
-  version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
-  subpackages:
-  - simplelru
-- name: github.com/klauspost/crc32
-  version: 19b0b332c9e4516a6370a0456e6182c3b5036720
-- name: github.com/reducedb/encoding
-  version: e31efcfdf1b19f4698709a6f522feaf101b1b1f4
-  subpackages:
-  - cursor
-  - delta/bp32
-  - bitpacking
-- name: github.com/rwcarlsen/goexif
-  version: 709fab3d192d7c62f86043caff1e7e3fb0f42bd8
-  subpackages:
-  - exif
-  - tiff
-- name: github.com/syndtr/goleveldb
-  version: fa5b5c78794bc5c18f330361059f871ae8c2b9d6
-  subpackages:
-  - leveldb
-  - leveldb/util
-  - leveldb/cache
-  - leveldb/comparer
-  - leveldb/errors
-  - leveldb/filter
-  - leveldb/iterator
-  - leveldb/journal
-  - leveldb/memdb
-  - leveldb/opt
-  - leveldb/storage
-  - leveldb/table
-- name: golang.org/x/image
-  version: 97680175a5267bb8b31f1923e7a66df98013b11a
-  subpackages:
-  - bmp
-  - tiff
-  - tiff/lzw
-- name: golang.org/x/net
-  version: bc3663df0ac92f928d419e31e0d2af22e683a5a2
-  subpackages:
-  - context
-- name: golang.org/x/sys
-  version: 62bee037599929a6e9146f29d10dd5208c43507d
-  subpackages:
-  - unix
-- name: gopkg.in/bufio.v1
-  version: 567b2bfa514e796916c4747494d6ff5132a1dfce
-- name: gopkg.in/inf.v0
-  version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
-- name: gopkg.in/redis.v2
-  version: e6179049628164864e6e84e973cfb56335748dea
-devImports: []
diff --git a/weed/glide.yaml b/weed/glide.yaml
index e58b3679e..36737fb21 100644
--- a/weed/glide.yaml
+++ b/weed/glide.yaml
@@ -4,23 +4,36 @@ import:
   subpackages:
   - fs
 - package: github.com/boltdb/bolt
+  version: ^1.3.1
 - package: github.com/chrislusf/raft
-- package: github.com/dgrijalva/jwt-go
-- package: github.com/disintegration/imaging
-- package: github.com/gocql/gocql
-- package: github.com/golang/protobuf
-  subpackages:
-  - proto
-- package: github.com/gorilla/mux
-- package: github.com/hashicorp/golang-lru
-- package: github.com/klauspost/crc32
-- package: github.com/reducedb/encoding
+- package: github.com/dataence/encoding
   subpackages:
   - cursor
   - delta/bp32
+- package: github.com/dgrijalva/jwt-go
+  version: ^3.2.0
+- package: github.com/disintegration/imaging
+  version: ^1.4.1
+- package: github.com/go-redis/redis
+  version: ^6.10.2
+- package: github.com/go-sql-driver/mysql
+  version: ^1.3.0
+- package: github.com/gocql/gocql
+- package: github.com/golang/protobuf
+  version: ^1.0.0
+  subpackages:
+  - proto
+- package: github.com/google/btree
+- package: github.com/gorilla/mux
+  version: ^1.6.1
+- package: github.com/klauspost/crc32
+  version: ^1.1.0
+- package: github.com/lib/pq
 - package: github.com/rwcarlsen/goexif
   subpackages:
   - exif
+- package: github.com/soheilhy/cmux
+  version: ^0.1.4
 - package: github.com/syndtr/goleveldb
   subpackages:
   - leveldb
@@ -28,4 +41,8 @@ import:
 - package: golang.org/x/net
   subpackages:
   - context
-- package: gopkg.in/redis.v2
+- package: google.golang.org/grpc
+  version: ^1.11.3
+  subpackages:
+  - peer
+  - reflection