Merge branch 'blur-25-cluster-config'
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/b47f6d18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/b47f6d18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/b47f6d18 Branch: refs/heads/master Commit: b47f6d189782b0133b1f3bc78286fcc3eff0c33c Parents: 16dfa11 d0a43ac Author: Tim <[email protected]> Authored: Thu Sep 27 19:53:49 2012 -0400 Committer: Tim <[email protected]> Committed: Thu Sep 27 19:53:49 2012 -0400 ---------------------------------------------------------------------- .../indexserver/DistributedIndexServer.java | 54 ++++++++------- .../org/apache/blur/thrift/BlurShardServer.java | 19 +++++- .../java/org/apache/blur/thrift/TableAdmin.java | 4 + .../apache/blur/thrift/ThriftBlurShardServer.java | 6 +- .../clusterstatus/ZookeeperClusterStatusTest.java | 10 ++- .../apache/blur/thrift/BlurShardServerTest.java | 5 +- 6 files changed, 66 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
