Merge branch 'STORM-67' of https://github.com/bourneagain/storm into STORM-67
Conflicts:
storm-core/src/jvm/backtype/storm/spout/ISpoutOutputCollector.java
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fd219375
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fd219375
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fd219375
Branch: refs/heads/master
Commit: fd21937526b4b20ac1670c623645ba131ed512ac
Parents: 5ac3062 0459bc9
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Sat Jul 18 11:51:15 2015 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Sat Jul 18 11:51:15 2015 +0900
----------------------------------------------------------------------
.../storm/eventhubs/spout/SpoutOutputCollectorMock.java | 5 +++++
storm-core/src/clj/backtype/storm/daemon/executor.clj | 3 +++
.../src/jvm/backtype/storm/spout/ISpoutOutputCollector.java | 1 +
.../src/jvm/backtype/storm/spout/SpoutOutputCollector.java | 5 +++++
storm-core/src/jvm/backtype/storm/testing/SpoutTracker.java | 6 ++++++
.../src/jvm/storm/trident/spout/RichSpoutBatchExecutor.java | 7 ++++++-
.../src/jvm/storm/trident/spout/RichSpoutBatchTriggerer.java | 4 ++++
7 files changed, 30 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fd219375/storm-core/src/clj/backtype/storm/daemon/executor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fd219375/storm-core/src/jvm/backtype/storm/spout/ISpoutOutputCollector.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/spout/ISpoutOutputCollector.java
index a7965ee,26a4843..709ae2a
--- a/storm-core/src/jvm/backtype/storm/spout/ISpoutOutputCollector.java
+++ b/storm-core/src/jvm/backtype/storm/spout/ISpoutOutputCollector.java
@@@ -27,5 -25,7 +27,6 @@@ public interface ISpoutOutputCollector
*/
List<Integer> emit(String streamId, List<Object> tuple, Object messageId);
void emitDirect(int taskId, String streamId, List<Object> tuple, Object
messageId);
- void reportError(Throwable error);
+ long getPendingCount();
}
