storm git commit: move STORM-1861 to 1.0.2 since we'll backport

[ka...@apache.org]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 4b72a8b9a -> ca6c34dac


move STORM-1861 to 1.0.2 since we'll backport


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ca6c34da
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ca6c34da
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ca6c34da

Branch: refs/heads/1.x-branch
Commit: ca6c34dac0612f94ad88dadf405d63d8b428a298
Parents: 4b72a8b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jun 1 17:25:40 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jun 1 17:25:40 2016 +0900

----------------------------------------------------------------------
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/ca6c34da/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 518957c..0f20108 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,5 @@
 ## 1.1.0
  * STORM-1868: Modify TridentKafkaWordCount to run in distributed mode
- * STORM-1861: Storm submit command returns exit code of 0 even when it fails.
  * STORM-1859: Ack late tuples in windowed mode
  * STORM-1851: Fix default nimbus impersonation authorizer config
  * STORM-1848: Make KafkaMessageId and Partition serializable to support
@@ -15,6 +14,7 @@
  * STORM-1720: Support GEO in storm-redis
 
 ## 1.0.2
+ * STORM-1861: Storm submit command returns exit code of 0 even when it fails.
  * STORM-1755: Revert the kafka client version to 0.8.x in storm-kafka
  * STORM-1745: Add partition to log output in PartitionManager
  * STORM-1735: Nimbus should log that replication succeeded when min replicas was reached exactly