accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [8/8] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Thu, 21 Nov 2013 17:54:55 GMT
Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 9b41155822f69d145317fb63d6a4088a56858eba
Parents: 1fba05a fe46a60
Author: Eric Newton <eric.newton@gmail.com>
Authored: Thu Nov 21 12:45:31 2013 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Thu Nov 21 12:45:31 2013 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/client/Instance.java   |  1 +
 .../client/admin/InstanceOperationsImpl.java    |  7 +-
 .../core/client/admin/TableOperationsImpl.java  |  5 +-
 .../core/client/impl/ConditionalWriterImpl.java |  6 +-
 .../accumulo/core/client/impl/MasterClient.java |  2 +-
 .../core/client/impl/OfflineScanner.java        |  4 +-
 .../core/client/impl/ScannerIterator.java       |  2 +-
 .../accumulo/core/client/impl/ServerClient.java |  4 +-
 .../client/impl/ServerConfigurationFactory.java | 30 ++++++
 .../impl/TabletServerBatchReaderIterator.java   |  2 +-
 .../client/impl/TabletServerBatchWriter.java    |  6 +-
 .../accumulo/core/client/impl/Writer.java       |  2 +-
 .../core/metadata/MetadataLocationObtainer.java |  7 +-
 .../accumulo/server/client/BulkImporter.java    |  9 +-
 .../accumulo/server/util/MetadataTableUtil.java | 99 +++-----------------
 .../gc/GarbageCollectWriteAheadLogs.java        |  3 +-
 .../accumulo/gc/SimpleGarbageCollector.java     | 13 +--
 .../java/org/apache/accumulo/master/Master.java |  3 +-
 18 files changed, 84 insertions(+), 121 deletions(-)
----------------------------------------------------------------------



Mime
View raw message