incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [4/7] git commit: Merge branch 'master' into v2_command
Date Mon, 07 Dec 2015 21:15:23 GMT
Merge branch 'master' into v2_command


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/32d16595
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/32d16595
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/32d16595

Branch: refs/heads/v2_command
Commit: 32d165952cd2229944308c572d5f71d1ad64d434
Parents: 4d8b0bc e4a02c0
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon Dec 7 14:51:43 2015 -0500
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon Dec 7 14:51:43 2015 -0500

----------------------------------------------------------------------
 .../apache/blur/command/BaseCommandManager.java | 30 +++++++++++---------
 .../manager/indexserver/ShardStateManager.java  | 12 ++++++++
 .../manager/writer/BlurIndexSimpleWriter.java   | 14 ++++++++-
 .../blur/manager/writer/IndexImporter.java      | 18 ++++++++++--
 .../blur/thrift/BlurControllerServer.java       |  4 +--
 .../org/apache/blur/kvs/HdfsKeyValueStore.java  |  4 +--
 .../blur/store/blockcache_v2/MeterWrapper.java  | 11 ++++++-
 .../apache/blur/store/hdfs/HdfsDirectory.java   | 19 ++++++++-----
 .../java/org/apache/blur/thrift/ClientPool.java |  8 ++++--
 .../apache/blur/memory/MemoryLeakDetector.java  |  6 +++-
 10 files changed, 94 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/32d16595/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
----------------------------------------------------------------------


Mime
View raw message