You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/10/02 00:54:37 UTC
[3/3] git commit: Merge branch 'STORM-428-fixed' of
github.com:wurstmeister/incubator-storm
Merge branch 'STORM-428-fixed' of github.com:wurstmeister/incubator-storm
Conflicts:
CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3f2eec5f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3f2eec5f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3f2eec5f
Branch: refs/heads/master
Commit: 3f2eec5ff3db9cdb72bd34027c9441e22e599dc2
Parents: f72dad8 9553b14
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Oct 1 15:48:40 2014 -0700
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Oct 1 15:48:40 2014 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
.../src/test/storm/kafka/TridentKafkaTest.java | 9 +-
.../src/jvm/backtype/storm/tuple/ITuple.java | 136 +++++++++++++++
.../src/jvm/backtype/storm/tuple/Tuple.java | 113 +------------
.../storm/trident/testing/MockTridentTuple.java | 166 -------------------
.../jvm/storm/trident/tuple/TridentTuple.java | 46 +----
.../storm/trident/tuple/TridentTupleView.java | 35 +++-
.../jvm/storm/trident/tuple/ValuePointer.java | 1 -
.../test/clj/storm/trident/tuple_test.clj | 28 ++--
9 files changed, 196 insertions(+), 339 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3f2eec5f/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index 9cc13ef,605a7da..c6371a6
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -78,7 -77,7 +78,8 @@@
* STORM-501: Missing StormSubmitter API
* STORM-493: Workers inherit storm.conf.file/storm.options properties of their supervisor
* STORM-498: make ZK connection timeout configurable in Kafka spout
+ * STORM-428: extracted ITuple interface
+ * STORM-508: Update DEVELOPER.md now that Storm has graduated from Incubator
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake