Merge tag 'v0.5.2' into develop

v0.5.2

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.2 (June 2, 2017)
+
+BUG FIXES:
+- fix parsing of the log level from Tendermint config (#97)
+
 ## 0.5.1 (May 30, 2017)
 
 BUG FIXES:

demo/start.sh

@@ -4,7 +4,7 @@ set -e
 cd $GOPATH/src/github.com/tendermint/basecoin/demo
 
 LOG_DIR="."
-TM_VERSION="develop"
+TM_VERSION="master"
 #TM_VERSION="v0.10.0"
 
 if [[ "$CIRCLECI" == "true" ]]; then

glide.lock

@@ -1,5 +1,5 @@
-hash: 3a787e2b71cb339f6ded93e0fb373acb75fcf0369a9600c5cb334a4c3ce9251c
-updated: 2017-06-02T07:47:27.151150316Z
+hash: b31c6e45072e1015b04b5a201fb5ffcbadb837f21fe4a499f3b7e93229ee1c45
+updated: 2017-06-02T09:22:48.505187474Z
 imports:
 - name: github.com/bgentry/speakeasy
   version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
@@ -127,7 +127,7 @@ imports:
   - data
   - data/base58
 - name: github.com/tendermint/light-client
-  version: 0cf9e0155b9f214ef752a40abf704324f932d336
+  version: 424905d3813586ce7e64e18690676250a0595ad4
   subpackages:
   - certifiers
   - certifiers/client
@@ -139,13 +139,13 @@ imports:
   - commands/txs
   - proofs
 - name: github.com/tendermint/merkleeyes
-  version: bd07eb397a9c0440cba80730b4d8e35d61f61698
+  version: 6b06ad654956c951b3d27e38bb566ae45aae1ff7
   subpackages:
   - app
   - client
   - iavl
 - name: github.com/tendermint/tendermint
-  version: 989cb6dd2e576212bf3052a28849ee44c8411b04
+  version: 2b5b0172531319ebc255a0ba638f6be666e5e46c
   subpackages:
   - blockchain
   - cmd/tendermint/commands
@@ -172,10 +172,11 @@ imports:
   - types
   - version
 - name: github.com/tendermint/tmlibs
-  version: 8c0959604c160ea79e84132a222b43582d8209c7
+  version: 6b619742ac69388dd591c30f55aaee46197b086e
   subpackages:
   - autofile
   - cli
+  - cli/flags
   - clist
   - common
   - db

glide.yaml

@@ -2,22 +2,27 @@ package: github.com/tendermint/basecoin
 import:
 - package: github.com/gorilla/websocket
 - package: github.com/pkg/errors
+  version: ^0.8.0
 - package: github.com/spf13/cobra
 - package: github.com/spf13/pflag
 - package: github.com/spf13/viper
 - package: github.com/tendermint/abci
+  version: ~0.5.0
+  version:
   subpackages:
   - server
   - types
 - package: github.com/tendermint/go-crypto
+  version: ~0.2.0
   subpackages:
   - cmd
   - keys
 - package: github.com/tendermint/go-wire
+  version: ~0.6.2
   subpackages:
   - data
 - package: github.com/tendermint/light-client
-  version: develop
+  version: ~0.10.0
   subpackages:
   - commands
   - commands/proofs
@@ -25,11 +30,12 @@ import:
   - commands/txs
   - proofs
 - package: github.com/tendermint/merkleeyes
+  version: ~0.2.0
   subpackages:
   - client
   - iavl
 - package: github.com/tendermint/tendermint
-  version: develop
+  version: ~0.10.0
   subpackages:
   - config
   - node
@@ -40,9 +46,10 @@ import:
   - rpc/lib/types
   - types
 - package: github.com/tendermint/tmlibs
-  version: develop
+  version: ~0.2.0
   subpackages:
   - cli
+  - cli/flags
   - common
   - events
   - log

version/version.go

@@ -2,6 +2,6 @@ package version
 
 const Maj = "0"
 const Min = "5"
-const Fix = "1"
+const Fix = "2"
 
-const Version = "0.5.1"
+const Version = "0.5.2"