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/07/23 16:44:52 UTC

[2/3] git commit: Merge branch 'S4-85' into piper

Merge branch 'S4-85' into piper


Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/fb10836e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/fb10836e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/fb10836e

Branch: refs/heads/piper
Commit: fb10836e7647f6b51a05510327dc2c41789bc70b
Parents: e97205c db7a890
Author: Matthieu Morel <mm...@apache.org>
Authored: Mon Jul 23 18:17:47 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Mon Jul 23 18:17:47 2012 +0200

----------------------------------------------------------------------
 .../apache/s4/comm/topology/AssignmentFromZK.java  |   10 +-
 .../org/apache/s4/comm/topology/ClusterFromZK.java |    7 ++-
 .../apache/s4/comm/topology/ClustersFromZK.java    |    9 +-
 .../org/apache/s4/comm/topology/RemoteStreams.java |    5 +
 .../s4/comm/topology/AssignmentsFromZKTest.java    |   68 ---------------
 .../s4/comm/topology/AssignmentsFromZKTest1.java   |   65 ++++++++++++++
 .../s4/comm/topology/AssignmentsFromZKTest2.java   |   23 +++++
 7 files changed, 109 insertions(+), 78 deletions(-)
----------------------------------------------------------------------