From b2219913d42659994fd0b68a9692b64fd00e079f Mon Sep 17 00:00:00 2001
From: Matt Reiferson <mreiferson@gmail.com>
Date: Wed, 21 Jan 2015 21:41:56 -0800
Subject: [PATCH] bump v1.0.2 stable

---
 ChangeLog.md | 12 ++++++++++++
 README.md    |  4 ++--
 version.go   |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index b48f7913..6603453a 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,17 @@
 ## go-nsq Change Log
 
+### 1.0.2 - 2015-01-21
+
+**Upgrading from 1.0.1**: here are no backward incompatible changes.
+
+ * #102 - TLS min/max config defaults (thanks @twmb)
+ * #99 - fix `Consumer.Stop()` race and `Producer.Stop()` deadlock (thanks @tylertreat)
+ * #92 - expose `Message.NSQDAddress`
+ * #95 - cleanup panic during `Consumer.Stop()` if handlers are deadlocked
+ * #98 - add `tls-min-version` option (thanks @twmb)
+ * #93 - expose a way to get `Consumer` runtime stats (thanks @dcarney)
+ * #94 - allow `#ephemeral` topic names (thanks @jamesgroat)
+
 ### 1.0.1 - 2014-11-09
 
 **Upgrading from 1.0.0**: There are no backward incompatible changes functionally, however this
diff --git a/README.md b/README.md
index a107b11e..81bdae1b 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ The official Go package for [NSQ][nsq].
 
 [![Build Status](https://secure.travis-ci.org/bitly/go-nsq.png?branch=master)][travis] [![GoDoc](https://godoc.org/github.com/bitly/go-nsq?status.svg)](https://godoc.org/github.com/bitly/go-nsq)
 
-The latest stable release is **[1.0.1][latest_tag]**.
+The latest stable release is **[1.0.2][latest_tag]**.
 
 NOTE: The public API has been refactored as of `v1.0.0` and is not backwards compatible with
 previous releases. **[0.3.7][legacy]** is the last stable release compatible with the legacy API.
@@ -25,4 +25,4 @@ See the [main repo apps][apps] directory for examples of clients built using thi
 [pr30]: https://github.com/bitly/go-nsq/pull/30
 [legacy]: https://github.com/bitly/go-nsq/releases/tag/v0.3.7
 [travis]: http://travis-ci.org/bitly/go-nsq
-[latest_tag]: https://github.com/bitly/go-nsq/releases/tag/v1.0.1
+[latest_tag]: https://github.com/bitly/go-nsq/releases/tag/v1.0.2
diff --git a/version.go b/version.go
index 245e4de5..7151ae79 100644
--- a/version.go
+++ b/version.go
@@ -5,4 +5,4 @@
 package nsq
 
 // VERSION
-const VERSION = "1.0.2-alpha"
+const VERSION = "1.0.2"