accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/3] accumulo git commit: Merge branch '1.7'
Date Wed, 29 Apr 2015 02:11:22 GMT
Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bcc79d00
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bcc79d00
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bcc79d00

Branch: refs/heads/master
Commit: bcc79d0062644917ca2bca4c90c25f2a541cb6b5
Parents: a7de08b c55fe3e
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Apr 28 22:09:40 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Apr 28 22:09:40 2015 -0400

----------------------------------------------------------------------
 .../accumulo/examples/simple/client/RandomBatchScanner.java   | 2 +-
 .../apache/accumulo/server/rpc/TNonblockingServerSocket.java  | 2 +-
 .../apache/accumulo/server/security/SecurityOperation.java    | 3 +--
 .../accumulo/server/security/handler/ZKPermHandler.java       | 5 +----
 .../java/org/apache/accumulo/server/util/TableDiskUsage.java  | 2 +-
 .../org/apache/accumulo/master/tableOps/ClonePermissions.java | 4 ++--
 .../org/apache/accumulo/master/tableOps/CompactRange.java     | 3 +++
 .../java/org/apache/accumulo/master/tableOps/CopyFailed.java  | 7 +++++--
 .../java/org/apache/accumulo/master/tableOps/ImportTable.java | 4 ++++
 .../java/org/apache/accumulo/master/tableOps/LoadFiles.java   | 6 +++---
 .../apache/accumulo/master/tableOps/MapImportFileNames.java   | 5 ++++-
 .../java/org/apache/accumulo/master/tableOps/MasterRepo.java  | 3 ---
 .../apache/accumulo/master/tableOps/MoveExportedFiles.java    | 5 ++++-
 .../accumulo/master/tableOps/PopulateMetadataTable.java       | 5 ++++-
 .../accumulo/master/tableOps/SetupNamespacePermissions.java   | 4 ++--
 .../org/apache/accumulo/master/tableOps/SetupPermissions.java | 4 ++--
 .../org/apache/accumulo/master/tableOps/TableRangeOp.java     | 3 +++
 .../org/apache/accumulo/master/tableOps/TableRangeOpWait.java | 5 ++++-
 .../main/java/org/apache/accumulo/master/tableOps/Utils.java  | 4 ++--
 .../java/org/apache/accumulo/tserver/scan/NextBatchTask.java  | 2 +-
 20 files changed, 48 insertions(+), 30 deletions(-)
----------------------------------------------------------------------



Mime
View raw message