You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/04 22:35:41 UTC
[4/4] storm git commit: Added STORM-1397 to Changelog
Added STORM-1397 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0390012b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0390012b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0390012b
Branch: refs/heads/master
Commit: 0390012bdf5f0e79d5bb450cf9f16f7bc6bce7c1
Parents: a13ebd6
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 4 15:24:15 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 4 15:24:15 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0390012b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb3717b..5a0f634 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1397: Merge conflict from Pacemaker merge
* STORM-1373: Blobstore API sample example usage
* STORM-1409: StormClientErrorHandler is not used
* STORM-1411: Some fixes for storm-windowing