Merge remote-tracking branch 'origin/master' into further-aws-deployment-improvements

CHANGELOG.md

@@ -14,10 +14,10 @@ For reference, the possible headings are:
 * **External Contributors** to list contributors outside of ascribe GmbH.
 
 
-## [Unreleased] - YYYY-MM-DD
-Tag name: TBD
-= commit: TBD
-committed: TBD
+## [0.2.0] - 2016-04-26
+Tag name: v0.2.0
+= commit: 0c4a2b380aabdcf50fa2d7fb351c290aaedc3db7
+committed: April 26, 2016, 11:09 AM GMT+2
 
 ### Added
 - Ability to use environment variables to set (or partially set) configuration settings: [Pull Request #153](https://github.com/bigchaindb/bigchaindb/pull/153)
@@ -50,6 +50,7 @@ committed: TBD
 
 ### Fixed
 - Bug related to config overwrite: [Pull Request #97](https://github.com/bigchaindb/bigchaindb/pull/97)
+- Bug related to running the `bigchaindb-benchmark load` on docker [Pull Request #225](https://github.com/bigchaindb/bigchaindb/pull/225)
 
 ## External Contributors
 - [@thedoctor](https://github.com/thedoctor): Pull Requests 

bigchaindb/version.py

@@ -1,2 +1,2 @@
-__version__ = '0.1.5'
-__short_version__ = '0.1'
+__version__ = '0.2.0'
+__short_version__ = '0.2'

docker-compose.yml

@@ -14,6 +14,7 @@ rethinkdb-data:
 
 bigchaindb:
   build: .
+  container_name: docker-bigchaindb
   volumes:
     - ./bigchaindb:/usr/src/app/bigchaindb
     - ./tests:/usr/src/app/tests

docs/source/installing-server.md

@@ -135,7 +135,7 @@ API Server bind? (default `localhost:9984`):
 Database host? (default `localhost`): rethinkdb
 Database port? (default `28015`): 
 Database name? (default `bigchain`): 
-Statsd host? (default `localhost`): statsd
+Statsd host? (default `localhost`):
 Statsd port? (default `8125`): 
 Statsd rate? (default `0.01`): 
 Ready to go!
@@ -152,7 +152,7 @@ $ docker-compose up -d
 
 then you can load test transactions via:
 ```text
-$ docker-compose run --rm bigchaindb bigchaindb-benchmark load
+$ docker exec -it docker-bigchaindb bigchaindb-benchmark load -m
 ```
 
 If you're on Linux, you can probably view the RethinkDB dashboard at: