Merge pull request #636 from opensds/development

Merge development to master branch to publish Capri Milestone-2
sodafoundation · Mar 27, 2019 · b9cd3fe · b9cd3fe
2 parents 76481a4 + ea275a7
commit b9cd3fe
Show file tree

Hide file tree

Showing 523 changed files with 161,551 additions and 35,215 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ build/
 *.log
 .DS_Store
 *.retry
+.idea/
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ go_import_path: github.com/opensds/opensds
 go:
   - 1.9.x
   - 1.11.x
+  - 1.12.x
   - tip
 
 env:

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -55,7 +55,11 @@
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "1.7.5"
+  version = "1.17.0"
+
+[[constraint]]
+  name = "github.com/golang/protobuf"
+  branch = "master"
 
 [[constraint]]
   name = "gopkg.in/yaml.v2"
@@ -65,6 +69,14 @@
   branch = "master"
   name = "github.com/howeyc/gopass"
 
+[[constraint]]
+  name = "github.com/gophercloud/gophercloud"
+  revision = "754e57e7867bfa48062ff2a237caad538085700a"
+
+[[constraint]]
+  name = "github.com/ceph/go-ceph"
+  revision = "81e4191e131b21e282a9289621383237677d2437"
+
 [prune]
   go-tests = true
   non-go = true