Merge branch 'BB-issue8/vendor-with-dep' into master

jllopis · Oct 30, 2017 · d915847 · d915847
2 parents 4afcb53 + 44202eb
commit d915847
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -3,8 +3,8 @@
 
 deps: ## Vendor go dependencies
 	@echo "Vendoring dependencies"
-	@go get -u github.com/kardianos/govendor
-	@govendor sync
+	@go get -u github.com/golang/dep
+	@dep ensure
 
 install-dev: deps ## Install dependencies and prepared development configuration
 	@echo "Installing development utils"

diff --git a/kvstore.go b/kvstore.go
@@ -7,9 +7,14 @@ import (
 	"strings"
 	"time"
 
+	// "github.com/abronan/libkv"
+	// "github.com/abronan/libkv/store"
+	// "github.com/abronan/libkv/store/consul"
+	// "github.com/abronan/libkv/store/etcd/v3"
 	"github.com/docker/libkv"
 	"github.com/docker/libkv/store"
 	"github.com/docker/libkv/store/consul"
+	// "github.com/docker/libkv/store/etcd"
 )
 
 type KVOptions struct {
@@ -64,6 +69,9 @@ func (gc *GetConf) EnableKVStore(opts *KVOptions) (*GetConf, error) {
 			return gc, errors.New("cannot create store consul")
 		}
 		gc.KVStore = kv
+	// case "etcd":
+	// 	etcd.Register()
+
 	default:
 		return gc, errors.New("unknown backend")
 	}