You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/01/25 00:29:57 UTC
[49/50] storm git commit: Merge branch 'STORM-1499' into 1.x-branch
Merge branch 'STORM-1499' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0ec6deaf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0ec6deaf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0ec6deaf
Branch: refs/heads/1.x-branch
Commit: 0ec6deaf44df562575d97871818e29f14d5a16d9
Parents: 974b1f0 19275b8
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jan 25 08:27:46 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jan 25 08:27:46 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 3 +
.../storm/trident/TestTridentTopology.java | 76 ++++++++++++++++++++
.../jvm/storm/trident/TestTridentTopology.java | 76 --------------------
3 files changed, 79 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0ec6deaf/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index 503a312,b959d34..e7373de
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -288,7 -290,6 +288,10 @@@
* STORM-742: Let ShellBolt treat all messages to update heartbeat
* STORM-992: A bug in the timer.clj might cause unexpected delay to schedule new event
++<<<<<<< HEAD
+
++=======
++>>>>>>> STORM-1499
## 0.10.0-beta1
* STORM-873: Flux does not handle diamond topologies