Merge pull request #8392 from gyuho/bbolt

vendor: coreos/bbolt v1.3.1-coreos.0, add others in glide.yaml
etcd-io · Aug 11, 2017 · 135b7f7 · 135b7f7
2 parents 6c4d990 + 2513e8c
commit 135b7f7
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 34 deletions.
diff --git a/cmd/vendor/github.com/coreos/bbolt/db.go b/cmd/vendor/github.com/coreos/bbolt/db.go
diff --git a/cmd/vendor/github.com/coreos/bbolt/freelist.go b/cmd/vendor/github.com/coreos/bbolt/freelist.go
diff --git a/cmd/vendor/github.com/coreos/bbolt/tx.go b/cmd/vendor/github.com/coreos/bbolt/tx.go
diff --git a/cmd/vendor/github.com/russross/blackfriday/html.go b/cmd/vendor/github.com/russross/blackfriday/html.go
diff --git a/cmd/vendor/github.com/russross/blackfriday/smartypants.go b/cmd/vendor/github.com/russross/blackfriday/smartypants.go
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -3,7 +3,7 @@ import:
 - package: github.com/bgentry/speakeasy
   version: v0.1.0
 - package: github.com/coreos/bbolt
-  version: ad39960eb40bb33c9bda31bed2eaf4fdda15efe6
+  version: v1.3.1-coreos.0
 - package: github.com/cockroachdb/cmux
   version: 112f0506e7743d64a6eb8fedbcff13d9979bbf92
 - package: github.com/coreos/go-semver
@@ -115,5 +115,18 @@ import:
   version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
 - package: github.com/dgrijalva/jwt-go
   version: v3.0.0
+- package: google.golang.org/genproto
+  version: 09f6ed296fc66555a25fe4ce95173148778dfa85
+  subpackages:
+  - googleapis/rpc/status
+- package: golang.org/x/text
+  version: b19bf474d317b857955b12035d2c5acb57ce8b01
+  subpackages:
+  - secure/bidirule
+  - transform
+  - unicode/bidi
+  - unicode/norm
+- package: github.com/russross/blackfriday
+  version: 4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c
 ignore:
   - google.golang.org/appengine
diff --git a/integration/metrics_test.go b/integration/metrics_test.go
@@ -50,7 +50,7 @@ func TestMetricDbSizeDefrag(t *testing.T) {
 	mc := toGRPC(clus.Client(0)).Maintenance
 
 	// expand the db size
-	numPuts := 10
+	numPuts := 25 // large enough to write more than 1 page
 	putreq := &pb.PutRequest{Key: []byte("k"), Value: make([]byte, 4096)}
 	for i := 0; i < numPuts; i++ {
 		if _, err := kvc.Put(context.TODO(), putreq); err != nil {