add STORM-2326 to changelog

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

Branch: refs/heads/1.x-branch
Commit: ba9f0e038fb3e1b4d5d8659dbb998ba9c63e6814
Parents: 335bfca
Author: P. Taylor Goetz <[email protected]>
Authored: Fri Feb 24 12:59:24 2017 -0500
Committer: P. Taylor Goetz <[email protected]>
Committed: Fri Feb 24 12:59:24 2017 -0500

----------------------------------------------------------------------
 CHANGELOG.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/ba9f0e03/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96f0a66..7a6d18d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,7 @@
-## 1.1.1
-* STORM-2334: Join Bolt implementation
-* STORM-1363: TridentKafkaState should handle null values from 
TridentTupleToKafkaMapper.getMessageFromTuple()
-
-## 1.1.0
+## 1.1.0
+ * STORM-2326: Upgrade log4j and slf4j
+ * STORM-2334: Join Bolt implementation
+ * STORM-1363: TridentKafkaState should handle null values from 
TridentTupleToKafkaMapper.getMessageFromTuple()
  * STORM-2365: Support for specifying output stream in event hubs spout 
  * STORM-2250: Kafka spout refactoring to increase modularity and testability
  * STORM-2340: fix AutoCommitMode issue in KafkaSpout

Reply via email to