accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Thu, 21 Nov 2013 22:41:28 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/0d802767
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0d802767
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0d802767

Branch: refs/heads/master
Commit: 0d802767099a2e485a826de9e1a9b1c38a22e7c0
Parents: 9b41155 2aad7fe
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Nov 21 17:41:01 2013 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Nov 21 17:41:01 2013 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/cli/ClientOpts.java    |   4 +-
 .../core/client/ClientConfiguration.java        | 260 +++++++
 .../apache/accumulo/core/client/Instance.java   |  26 +-
 .../accumulo/core/client/ZooKeeperInstance.java |  19 +-
 .../client/admin/InstanceOperationsImpl.java    |   8 +-
 .../core/client/admin/TableOperationsImpl.java  |   6 +-
 .../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 -
 .../client/impl/ServerConfigurationUtil.java    |  63 ++
 .../impl/TabletServerBatchReaderIterator.java   |   2 +-
 .../client/impl/TabletServerBatchWriter.java    |   6 +-
 .../accumulo/core/client/impl/Writer.java       |   2 +-
 .../core/client/mapred/AbstractInputFormat.java |   2 +-
 .../core/client/mapred/AccumuloInputFormat.java |   2 +-
 .../mapred/AccumuloMultiTableInputFormat.java   |   2 +-
 .../client/mapred/AccumuloOutputFormat.java     |   2 +-
 .../client/mapred/AccumuloRowInputFormat.java   |   2 +-
 .../client/mapreduce/AbstractInputFormat.java   |   2 +-
 .../client/mapreduce/AccumuloInputFormat.java   |   2 +-
 .../AccumuloMultiTableInputFormat.java          |   2 +-
 .../client/mapreduce/AccumuloOutputFormat.java  |   2 +-
 .../mapreduce/AccumuloRowInputFormat.java       |   2 +-
 .../mapreduce/lib/util/ConfiguratorBase.java    |   2 +-
 .../accumulo/core/client/mock/MockInstance.java |  37 +-
 .../accumulo/core/conf/ClientConfiguration.java | 310 --------
 .../core/metadata/MetadataLocationObtainer.java |   8 +-
 .../apache/accumulo/core/util/shell/Shell.java  |  11 +-
 .../core/util/shell/ShellOptionsJC.java         |   4 +-
 .../core/client/impl/TabletLocatorImplTest.java | 755 ++++++++++---------
 .../lib/util/ConfiguratorBaseTest.java          |   4 +-
 .../core/conf/ClientConfigurationTest.java      |   3 +-
 .../core/util/shell/ShellSetInstanceTest.java   |  17 +-
 .../examples/simple/filedata/FileDataQuery.java |   2 +-
 .../simple/mapreduce/TokenFileWordCount.java    |   2 +-
 .../examples/simple/reservations/ARS.java       |   2 +-
 .../minicluster/MiniAccumuloCluster.java        |   2 +-
 .../minicluster/MiniAccumuloInstance.java       |   2 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  |   2 +-
 .../accumulo/server/client/BulkImporter.java    |  11 +-
 .../accumulo/server/client/HdfsZooInstance.java |  67 +-
 .../accumulo/utils/metanalysis/IndexMeta.java   |   2 +-
 .../gc/GarbageCollectWriteAheadLogs.java        |   4 +-
 .../accumulo/gc/SimpleGarbageCollector.java     |  13 +-
 .../java/org/apache/accumulo/master/Master.java |   4 +-
 .../src/main/c++/nativeMap/BlockAllocator.h     |   1 -
 server/native/src/main/resources/Makefile       |  11 +-
 .../apache/accumulo/test/IMMLGBenchmark.java    |   2 +-
 .../metadata/MetadataBatchScanTest.java         |   2 +-
 .../test/performance/thrift/NullTserver.java    |   2 +-
 .../apache/accumulo/test/randomwalk/State.java  |   2 +-
 .../test/randomwalk/multitable/CopyTool.java    |   2 +-
 .../randomwalk/sequential/MapRedVerifyTool.java |   2 +-
 .../accumulo/test/scalability/ScaleTest.java    |   2 +-
 .../test/MultiTableBatchWriterTest.java         |   2 +-
 58 files changed, 873 insertions(+), 883 deletions(-)
----------------------------------------------------------------------



Mime
View raw message