From: Bin Yang <bin.yang@windriver.com>
Date: Fri, 12 Apr 2019 03:26:01 +0000 (+0000)
Subject: Merge "Day 2 Configuration API's"
X-Git-Tag: 0.1.0~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=84c644d692929bbf041aae16c91e6dbf5fbdeb7f;p=multicloud%2Fk8s.git

Merge "Day 2 Configuration API's"
---

84c644d692929bbf041aae16c91e6dbf5fbdeb7f
diff --cc src/k8splugin/go.mod
index 531615a6,59c7a173..474e5102
--- a/src/k8splugin/go.mod
+++ b/src/k8splugin/go.mod
@@@ -66,8 -67,8 +67,9 @@@ require 
  	github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51 // indirect
  	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
  	github.com/xdg/stringprep v1.0.0 // indirect
+ 	go.etcd.io/etcd v3.3.12+incompatible
  	go.mongodb.org/mongo-driver v1.0.0
 +	golang.org/x/crypto v0.0.0-20180904163835-0709b304e793
  	golang.org/x/net v0.0.0-20181201002055-351d144fa1fc
  	golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 // indirect
  	golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect