Merge branch 'apache-blur-0.2' of https://git-wip-us.apache.org/repos/asf/incubator-blur into apache-blur-0.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/8d1434ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/8d1434ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/8d1434ee Branch: refs/heads/console-v2 Commit: 8d1434ee3605fbf006484dfccd58a921a7205ec6 Parents: 42a7a5d 6101aac Author: Aaron McCurry <[email protected]> Authored: Mon May 5 14:39:12 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Mon May 5 14:39:12 2014 -0400 ---------------------------------------------------------------------- .../indexserver/DistributedIndexServer.java | 7 +- .../blur/manager/indexserver/SafeMode.java | 49 ++++++------- .../blur/thrift/ThriftBlurShardServer.java | 7 +- .../blur/manager/indexserver/SafeModeTest.java | 76 +++++++++++++++++--- .../org/apache/blur/utils/BlurConstants.java | 10 ++- .../src/main/resources/blur-default.properties | 5 +- docs/cluster-setup.html | 4 +- 7 files changed, 117 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
