Update README & CHANGELOG with docker and NSQ changes

2015-10-27 15:47:27 -06:00 · 2015-10-27 15:47:27 -06:00 · 09a0c3b40f
parent e622bd5e7f
commit 09a0c3b40f
2 changed files with 5 additions and 0 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,8 +1,12 @@
 ## v0.2.1 [unreleased]

 ### Release Notes
+- Telegraf will no longer use docker-compose for "long" unit test, it has been
+changed to just run docker commands in the Makefile. See `make docker-run` and
+`make docker-kill`. `make test` will still run all unit tests with docker.

 ### Features
+- [#325](https://github.com/influxdb/telegraf/pull/325): NSQ output. Thanks @jrxFive!

 ### Bugfixes

--- a/README.md
+++ b/README.md
@ -214,6 +214,7 @@ found by running `telegraf -sample-config`.
 ## Supported Outputs

 * influxdb
+* nsq
 * kafka
 * datadog
 * opentsdb