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.yaml

@@ -2,34 +2,40 @@ 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
   - commands/seeds
   - 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"