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/9edd0bd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/9edd0bd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/9edd0bd4 Branch: refs/heads/master Commit: 9edd0bd44d4dd709bcda147202705a083a012689 Parents: 99212b7 8574320 Author: Aaron McCurry <[email protected]> Authored: Tue Sep 30 08:49:40 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Tue Sep 30 08:49:40 2014 -0400 ---------------------------------------------------------------------- .../org/apache/blur/command/BaseContext.java | 32 ++++++++++++ .../org/apache/blur/command/ClusterContext.java | 21 ++------ .../apache/blur/command/CombiningContext.java | 12 +---- .../java/org/apache/blur/command/Command.java | 9 ++++ .../org/apache/blur/command/IndexContext.java | 10 ++-- .../blur/command/ShardCommandManager.java | 54 ++++++++++++-------- 6 files changed, 85 insertions(+), 53 deletions(-) ----------------------------------------------------------------------
