incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/2] git commit: Merge branch '0.1.5-blur-102' into 0.1.5
Date Tue, 04 Jun 2013 02:13:39 GMT
Merge branch '0.1.5-blur-102' 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/9e31fcc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/9e31fcc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/9e31fcc6

Branch: refs/heads/0.1.5
Commit: 9e31fcc645e7cd0480c9f001f2bdacfd4878b4f9
Parents: 688b8c6 70a6d44
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon Jun 3 22:13:28 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon Jun 3 22:13:28 2013 -0400

----------------------------------------------------------------------
 .../java/org/apache/blur/manager/IndexManager.java |   43 +++++--
 .../blur/manager/results/BlurResultIterable.java   |    7 +-
 .../manager/results/BlurResultIterableClient.java  |   48 +++++--
 .../results/BlurResultIterableMultiple.java        |    7 +-
 .../blur/manager/results/LazyBlurResult.java       |   47 +++++++
 .../blur/server/ShardServerEventHandler.java       |    8 +-
 .../apache/blur/thrift/BlurControllerServer.java   |  108 ++++++++++++---
 .../org/apache/blur/utils/BlurThriftRecord.java    |    2 +-
 .../main/java/org/apache/blur/utils/BlurUtil.java  |    7 +
 .../org/apache/blur/utils/RowDocumentUtil.java     |   11 +-
 .../org/apache/blur/thrift/BlurClusterTest.java    |   72 ++++++++---
 .../org/apache/blur/thrift/AbstractCommand.java    |   62 ++++++++-
 .../org/apache/blur/thrift/BlurClientManager.java  |   41 ++++--
 .../apache/blur/thrift/commands/BlurCommand.java   |    6 +-
 14 files changed, 373 insertions(+), 96 deletions(-)
----------------------------------------------------------------------



Mime
View raw message