You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/07/06 20:22:42 UTC
[3/4] accumulo git commit: merge origin/master
merge origin/master
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0e9f2b0e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0e9f2b0e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0e9f2b0e
Branch: refs/heads/master
Commit: 0e9f2b0ebca2b6a92a40a1255f62246e35be06d3
Parents: 1e2a84f 1dd6b70
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Jul 6 14:10:50 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Jul 6 14:10:50 2015 -0400
----------------------------------------------------------------------
assemble/conf/templates/client.conf | 20 ++++++++++++
.../accumulo/core/client/ScannerBase.java | 20 ++++++++++++
...AcceptableThriftTableOperationException.java | 34 ++++++++++++++++++++
.../main/asciidoc/chapters/administration.txt | 25 +++++++++++++-
.../accumulo/fate/AcceptableException.java | 29 +++++++++++++++++
.../java/org/apache/accumulo/fate/Fate.java | 9 +++++-
.../tabletserver/LargestFirstMemoryManager.java | 24 +++++++++++---
.../accumulo/master/FateServiceHandler.java | 6 ++--
.../accumulo/master/tableOps/BulkImport.java | 20 ++++++------
.../master/tableOps/ClonePermissions.java | 4 +--
.../accumulo/master/tableOps/CloneTable.java | 7 ++--
.../accumulo/master/tableOps/CompactRange.java | 10 +++---
.../master/tableOps/CompactionDriver.java | 8 ++---
.../tableOps/ImportPopulateZookeeper.java | 6 ++--
.../accumulo/master/tableOps/ImportTable.java | 12 +++----
.../accumulo/master/tableOps/LoadFiles.java | 4 +--
.../master/tableOps/MapImportFileNames.java | 4 +--
.../master/tableOps/MoveExportedFiles.java | 6 ++--
.../master/tableOps/PopulateMetadataTable.java | 8 ++---
.../master/tableOps/RenameNamespace.java | 4 +--
.../accumulo/master/tableOps/RenameTable.java | 6 ++--
.../accumulo/master/tableOps/TableRangeOp.java | 6 ++--
.../apache/accumulo/master/tableOps/Utils.java | 19 +++++------
.../master/tableOps/WriteExportFiles.java | 8 ++---
.../apache/accumulo/shell/mock/MockShell.java | 11 +++++++
25 files changed, 237 insertions(+), 73 deletions(-)
----------------------------------------------------------------------