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 2013/12/21 03:26:23 UTC
[4/4] git commit: Merge branch 'netty-default'
Merge branch 'netty-default'
Conflicts:
storm-netty/project.clj
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/d79f6b80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/d79f6b80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/d79f6b80
Branch: refs/heads/master
Commit: d79f6b808cd294b15ec06e41f60b9dbbf1d3986b
Parents: d3414f5 962d520
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Dec 20 21:23:47 2013 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Dec 20 21:23:47 2013 -0500
----------------------------------------------------------------------
MODULES | 1 -
bin/install_zmq.sh | 48 ----
conf/defaults.yaml | 2 +-
storm-core/project.clj | 2 +-
.../src/clj/backtype/storm/messaging/zmq.clj | 108 ---------
storm-core/src/clj/backtype/storm/testing.clj | 2 +-
storm-core/src/clj/zilch/mq.clj | 119 ----------
.../backtype/storm/messaging/netty/Client.java | 221 ++++++++++++++++++
.../backtype/storm/messaging/netty/Context.java | 67 ++++++
.../storm/messaging/netty/ControlMessage.java | 67 ++++++
.../storm/messaging/netty/MessageBatch.java | 168 ++++++++++++++
.../storm/messaging/netty/MessageDecoder.java | 85 +++++++
.../storm/messaging/netty/MessageEncoder.java | 39 ++++
.../backtype/storm/messaging/netty/Server.java | 136 ++++++++++++
.../messaging/netty/StormClientHandler.java | 121 ++++++++++
.../netty/StormClientPipelineFactory.java | 44 ++++
.../messaging/netty/StormServerHandler.java | 70 ++++++
.../netty/StormServerPipelineFactory.java | 45 ++++
.../storm/messaging/netty_integration_test.clj | 59 +++++
.../storm/messaging/netty_unit_test.clj | 112 ++++++++++
.../test/clj/backtype/storm/messaging_test.clj | 2 +-
storm-core/test/clj/zilch/test/mq.clj | 101 ---------
storm-netty/project.clj | 28 ---
.../backtype/storm/messaging/netty/Client.java | 222 -------------------
.../backtype/storm/messaging/netty/Context.java | 67 ------
.../storm/messaging/netty/ControlMessage.java | 68 ------
.../storm/messaging/netty/MessageBatch.java | 170 --------------
.../storm/messaging/netty/MessageDecoder.java | 85 -------
.../storm/messaging/netty/MessageEncoder.java | 39 ----
.../backtype/storm/messaging/netty/Server.java | 137 ------------
.../messaging/netty/StormClientHandler.java | 128 -----------
.../netty/StormClientPipelineFactory.java | 44 ----
.../messaging/netty/StormServerHandler.java | 76 -------
.../netty/StormServerPipelineFactory.java | 45 ----
.../storm/messaging/netty_integration_test.clj | 59 -----
.../storm/messaging/netty_unit_test.clj | 112 ----------
36 files changed, 1238 insertions(+), 1661 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d79f6b80/conf/defaults.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d79f6b80/storm-core/project.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d79f6b80/storm-core/src/clj/backtype/storm/testing.clj
----------------------------------------------------------------------