Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/26465679 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/26465679 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/26465679 Branch: refs/heads/apache-blur-0.2 Commit: 264656793b6fa57f8f801638393ae3c5c29f72d9 Parents: c80839d 37518fc Author: Rahul Challapalli <[email protected]> Authored: Thu Sep 19 00:35:10 2013 -0700 Committer: Rahul Challapalli <[email protected]> Committed: Thu Sep 19 00:35:10 2013 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/blur/manager/IndexManager.java | 6 ++++++ .../test/java/org/apache/blur/manager/IndexManagerTest.java | 7 +++++++ .../apache/blur/manager/writer/TransactionRecorderTest.java | 3 ++- .../src/test/java/org/apache/blur/thrift/BlurClusterTest.java | 4 ++-- pom.xml | 1 + 5 files changed, 18 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
