Merge "Day 2 Configuration API's"
authorBin Yang <bin.yang@windriver.com>
Fri, 12 Apr 2019 03:26:01 +0000 (03:26 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 12 Apr 2019 03:26:01 +0000 (03:26 +0000)
1  2 
src/k8splugin/api/api.go
src/k8splugin/cmd/main.go
src/k8splugin/go.mod
src/k8splugin/go.sum

Simple merge
Simple merge
@@@ -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
Simple merge