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/1ecfe424 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/1ecfe424 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/1ecfe424 Branch: refs/heads/master Commit: 1ecfe42478048b89368415d0545c665009e51905 Parents: bf56071 6ca03b6 Author: Aaron McCurry <[email protected]> Authored: Tue Sep 23 20:20:40 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Tue Sep 23 20:20:40 2014 -0400 ---------------------------------------------------------------------- .../blur/command/DocumentCountCombinerTest.java | 2 +- .../apache/blur/command/TermsCommandTest.java | 8 ++-- .../blur/command/TestCombiningContext.java | 45 ++++++++++++++++++++ 3 files changed, 50 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
