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/4668e18d Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/4668e18d Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/4668e18d Branch: refs/heads/master Commit: 4668e18da709980d92cc12cf3734e4ed5522188b Parents: 74118af 8a91600 Author: Aaron McCurry <[email protected]> Authored: Thu Sep 25 20:17:18 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Thu Sep 25 20:17:18 2014 -0400 ---------------------------------------------------------------------- .../org/apache/blur/command/TermsCommand.java | 3 +- .../apache/blur/command/TermsCommandTest.java | 30 +++++++++----------- .../org/apache/blur/manager/IndexManager.java | 3 +- .../blur/thrift/BlurControllerServer.java | 3 +- 4 files changed, 20 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
