From f89279cf11b4b52792741aed4ab86bf7e168e04e Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Fri, 21 Apr 2017 13:39:02 -0400 Subject: [PATCH 1/3] fix CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3d2bfbc..b1eec2f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 0.9.1 (April 18, 2017) +## 0.9.1 (April 21, 2017) FEATURES: From c21cec002c5fcf485193acc612713f091a1ce0c8 Mon Sep 17 00:00:00 2001 From: rigel rozanski Date: Fri, 21 Apr 2017 16:39:50 -0400 Subject: [PATCH 2/3] reset fix --- cmd/tendermint/commands/reset_priv_validator.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/tendermint/commands/reset_priv_validator.go b/cmd/tendermint/commands/reset_priv_validator.go index b1fb334b..4b7d2df4 100644 --- a/cmd/tendermint/commands/reset_priv_validator.go +++ b/cmd/tendermint/commands/reset_priv_validator.go @@ -48,15 +48,15 @@ func ResetAll(c cfg.Config, l log15.Logger) { func ResetPrivValidator(c cfg.Config, l log15.Logger) { // Get PrivValidator var privValidator *types.PrivValidator - privValidatorFile := config.GetString("priv_validator_file") + privValidatorFile := c.GetString("priv_validator_file") if _, err := os.Stat(privValidatorFile); err == nil { privValidator = types.LoadPrivValidator(privValidatorFile) privValidator.Reset() - log.Notice("Reset PrivValidator", "file", privValidatorFile) + l.Notice("Reset PrivValidator", "file", privValidatorFile) } else { privValidator = types.GenPrivValidator() privValidator.SetFile(privValidatorFile) privValidator.Save() - log.Notice("Generated PrivValidator", "file", privValidatorFile) + l.Notice("Generated PrivValidator", "file", privValidatorFile) } } From 6bcd4242f1f336e2b2ef4f644fabaf56222b34d0 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Wed, 26 Apr 2017 00:17:53 -0400 Subject: [PATCH 3/3] CHANGELOG and version bump --- CHANGELOG.md | 6 ++++++ version/version.go | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1eec2f8..92d6c112 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.9.2 (April 26, 2017) + +BUG FIXES: + +- Fix bug in `ResetPrivValidator` where we were using the global config and log (causing external consumers, eg. basecoin, to fail). + ## 0.9.1 (April 21, 2017) FEATURES: diff --git a/version/version.go b/version/version.go index cd172609..b35a2dae 100644 --- a/version/version.go +++ b/version/version.go @@ -2,6 +2,6 @@ package version const Maj = "0" const Min = "9" -const Fix = "1" +const Fix = "2" -const Version = "0.9.1" +const Version = "0.9.2"