You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/01/03 14:03:29 UTC
[47/50] [abbrv] git commit: Merge branch 's4-zk'
Merge branch 's4-zk'
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/f6f12476
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/f6f12476
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/f6f12476
Branch: refs/heads/piper
Commit: f6f1247690ea17f989d2a79f5e601838140911af
Parents: 5dde488 a1a546e
Author: Kishore Gopalakrishna <g....@gmail.com>
Authored: Fri Oct 21 23:10:36 2011 -0700
Committer: Kishore Gopalakrishna <g....@gmail.com>
Committed: Fri Oct 21 23:10:36 2011 -0700
----------------------------------------------------------------------
build.gradle | 5 +-
settings.gradle | 1 +
subprojects/s4-admin/s4-admin.gradle | 24 ++
.../main/java/org/apache/s4/admin/TaskSetup.java | 60 ++++
subprojects/s4-comm/s4-comm.gradle | 2 +
.../org/apache/s4/comm/netty/NettyEmitter.java | 3 +-
.../apache/s4/comm/topology/AssignmentFromZK.java | 232 +++++++++++++++
.../java/org/apache/s4/comm/topology/Cluster.java | 56 +++-
.../apache/s4/comm/topology/TopologyFromZK.java | 146 +++++++++
.../java/org/apache/s4/comm/topology/ZNRecord.java | 59 ++++
.../s4/comm/topology/ZNRecordSerializer.java | 40 +++
.../java/org/apache/s4/comm/topology/ZkClient.java | 78 +++++
.../java/org/apache/s4/comm/udp/UDPEmitter.java | 2 +-
.../s4/comm/topology/ZNRecordSerializerTest.java | 20 ++
14 files changed, 707 insertions(+), 21 deletions(-)
----------------------------------------------------------------------