Merge pull request #8902 from jpbetz/automated-cherry-pick-of-#8813-r…

…elease-3.1 Automated cherry pick of #8813 release 3.1
etcd-io · Nov 22, 2017 · 22b67da · 22b67da
2 parents 3ab9894 + 4b53ab0
commit 22b67da
Show file tree

Hide file tree

Showing 37 changed files with 566 additions and 215 deletions.
diff --git a/cmd/vendor/github.com/boltdb/bolt/LICENSE → cmd/vendor/github.com/coreos/bbolt/LICENSE b/cmd/vendor/github.com/boltdb/bolt/LICENSE → cmd/vendor/github.com/coreos/bbolt/LICENSE
diff --git a/...vendor/github.com/boltdb/bolt/bolt_386.go → ...endor/github.com/coreos/bbolt/bolt_386.go b/...vendor/github.com/boltdb/bolt/bolt_386.go → ...endor/github.com/coreos/bbolt/bolt_386.go
diff --git a/...ndor/github.com/boltdb/bolt/bolt_amd64.go → ...dor/github.com/coreos/bbolt/bolt_amd64.go b/...ndor/github.com/boltdb/bolt/bolt_amd64.go → ...dor/github.com/coreos/bbolt/bolt_amd64.go
diff --git a/cmd/vendor/github.com/coreos/bbolt/bolt_arm.go b/cmd/vendor/github.com/coreos/bbolt/bolt_arm.go
diff --git a/...ndor/github.com/boltdb/bolt/bolt_arm64.go → ...dor/github.com/coreos/bbolt/bolt_arm64.go b/...ndor/github.com/boltdb/bolt/bolt_arm64.go → ...dor/github.com/coreos/bbolt/bolt_arm64.go
diff --git a/...ndor/github.com/boltdb/bolt/bolt_linux.go → ...dor/github.com/coreos/bbolt/bolt_linux.go b/...ndor/github.com/boltdb/bolt/bolt_linux.go → ...dor/github.com/coreos/bbolt/bolt_linux.go
diff --git a/cmd/vendor/github.com/coreos/bbolt/bolt_mips64x.go b/cmd/vendor/github.com/coreos/bbolt/bolt_mips64x.go
diff --git a/...vendor/github.com/boltdb/bolt/bolt_arm.go → ...dor/github.com/coreos/bbolt/bolt_mipsx.go b/...vendor/github.com/boltdb/bolt/bolt_arm.go → ...dor/github.com/coreos/bbolt/bolt_mipsx.go
diff --git a/...or/github.com/boltdb/bolt/bolt_openbsd.go → ...r/github.com/coreos/bbolt/bolt_openbsd.go b/...or/github.com/boltdb/bolt/bolt_openbsd.go → ...r/github.com/coreos/bbolt/bolt_openbsd.go
diff --git a/...vendor/github.com/boltdb/bolt/bolt_ppc.go → ...endor/github.com/coreos/bbolt/bolt_ppc.go b/...vendor/github.com/boltdb/bolt/bolt_ppc.go → ...endor/github.com/coreos/bbolt/bolt_ppc.go
diff --git a/...ndor/github.com/boltdb/bolt/bolt_ppc64.go → ...dor/github.com/coreos/bbolt/bolt_ppc64.go b/...ndor/github.com/boltdb/bolt/bolt_ppc64.go → ...dor/github.com/coreos/bbolt/bolt_ppc64.go
diff --git a/...or/github.com/boltdb/bolt/bolt_ppc64le.go → ...r/github.com/coreos/bbolt/bolt_ppc64le.go b/...or/github.com/boltdb/bolt/bolt_ppc64le.go → ...r/github.com/coreos/bbolt/bolt_ppc64le.go
diff --git a/...ndor/github.com/boltdb/bolt/bolt_s390x.go → ...dor/github.com/coreos/bbolt/bolt_s390x.go b/...ndor/github.com/boltdb/bolt/bolt_s390x.go → ...dor/github.com/coreos/bbolt/bolt_s390x.go
diff --git a/...endor/github.com/boltdb/bolt/bolt_unix.go → ...ndor/github.com/coreos/bbolt/bolt_unix.go b/...endor/github.com/boltdb/bolt/bolt_unix.go → ...ndor/github.com/coreos/bbolt/bolt_unix.go
diff --git a/...thub.com/boltdb/bolt/bolt_unix_solaris.go → ...hub.com/coreos/bbolt/bolt_unix_solaris.go b/...thub.com/boltdb/bolt/bolt_unix_solaris.go → ...hub.com/coreos/bbolt/bolt_unix_solaris.go
diff --git a/...or/github.com/boltdb/bolt/bolt_windows.go → ...r/github.com/coreos/bbolt/bolt_windows.go b/...or/github.com/boltdb/bolt/bolt_windows.go → ...r/github.com/coreos/bbolt/bolt_windows.go
diff --git a/...r/github.com/boltdb/bolt/boltsync_unix.go → .../github.com/coreos/bbolt/boltsync_unix.go b/...r/github.com/boltdb/bolt/boltsync_unix.go → .../github.com/coreos/bbolt/boltsync_unix.go
diff --git a/cmd/vendor/github.com/boltdb/bolt/bucket.go → cmd/vendor/github.com/coreos/bbolt/bucket.go b/cmd/vendor/github.com/boltdb/bolt/bucket.go → cmd/vendor/github.com/coreos/bbolt/bucket.go
diff --git a/cmd/vendor/github.com/boltdb/bolt/cursor.go → cmd/vendor/github.com/coreos/bbolt/cursor.go b/cmd/vendor/github.com/boltdb/bolt/cursor.go → cmd/vendor/github.com/coreos/bbolt/cursor.go