Merge branch '0.1.5-patch-blur-77' into 0.1.5
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/d37ded63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/d37ded63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/d37ded63 Branch: refs/heads/0.1.5 Commit: d37ded638d443ee35baba9c80f4d7746ed60fee2 Parents: 53cf9b1 c9f52d0 Author: Aaron McCurry <[email protected]> Authored: Mon Apr 29 23:17:03 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Mon Apr 29 23:17:03 2013 -0400 ---------------------------------------------------------------------- .../indexserver/DistributedIndexServer.java | 78 ++------- .../blur/manager/writer/BlurIndexReader.java | 80 +++++++-- .../blur/manager/writer/BlurIndexReaderTest.java | 143 +++++++++++++++ .../src/main/resources/blur-default.properties | 2 +- 4 files changed, 227 insertions(+), 76 deletions(-) ----------------------------------------------------------------------
