Merge branch 'master' into develop

cosmos · Mar 13, 2019 · ed33c20 · ed33c20
2 parents 40f9538 + 2f35d30
commit ed33c20
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.12.2 (March 13, 2019)
+
+IMPROVEMENTS
+
+ - Use Tendermint v0.30.2 and close batch after write (related pull request in Tendermint: https://github.com/tendermint/tendermint/pull/3397)
+
+
 ## 0.12.1 (February 12, 2019)
 
 IMPROVEMENTS

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -8,7 +8,7 @@
 
 [[constraint]]
   name = "github.com/tendermint/tendermint"
-  version = "v0.30.0"
+  version = "v0.30.2"
 
 [prune]
   go-tests = true

diff --git a/nodedb.go b/nodedb.go
@@ -330,6 +330,7 @@ func (ndb *nodeDB) Commit() {
 	defer ndb.mtx.Unlock()
 
 	ndb.batch.Write()
+	ndb.batch.Close()
 	ndb.batch = ndb.db.NewBatch()
 }
 

diff --git a/version.go b/version.go
@@ -1,4 +1,4 @@
 package iavl
 
 // Version of iavl.
-const Version = "0.12.1"
+const Version = "0.12.2"