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/04/25 01:21:07 UTC

[21/34] accumulo git commit: Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/accumulo


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

Branch: refs/heads/master
Commit: bd6dbba5b871e89aacdfb4b06b223047e9a0a159
Parents: 65d0145 cf69821
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 16 12:05:44 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 16 12:05:44 2015 -0400

----------------------------------------------------------------------
 .../core/client/NewTableConfiguration.java      | 108 ----------------
 .../client/admin/CompactionStrategyConfig.java  |   8 +-
 .../client/admin/NewTableConfiguration.java     | 107 ++++++++++++++++
 .../core/client/admin/TableOperations.java      |   1 -
 .../core/client/impl/ConditionalWriterImpl.java |   2 +-
 .../core/client/impl/TableOperationsImpl.java   |   2 +-
 .../core/client/mapreduce/RangeInputSplit.java  |   5 +
 .../core/client/mock/MockTableOperations.java   |   2 +-
 .../accumulo/core/file/BloomFilterLayer.java    |   2 +-
 .../accumulo/core/util/LoggingRunnable.java     |  50 --------
 .../accumulo/core/util/NamingThreadFactory.java |   1 +
 .../client/impl/TableOperationsHelperTest.java  |   2 +-
 .../client/mock/MockTableOperationsTest.java    |   2 +-
 .../minicluster/MiniAccumuloInstance.java       |   3 +-
 .../minicluster/MiniAccumuloClusterTest.java    |   2 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  |   2 +-
 .../accumulo/server/client/BulkImporter.java    |   2 +-
 .../server/problems/ProblemReports.java         |   2 +-
 .../accumulo/server/rpc/TServerUtils.java       |   2 +-
 .../org/apache/accumulo/monitor/Monitor.java    |   2 +-
 .../apache/accumulo/tserver/TabletServer.java   |   4 +-
 .../tserver/TabletServerResourceManager.java    |   5 +-
 .../EverythingCompactionStrategy.java           |   2 +-
 .../apache/accumulo/tserver/log/DfsLogger.java  |   2 +-
 .../tserver/tablet/MinorCompactionTask.java     |   8 +-
 .../apache/accumulo/tserver/tablet/Tablet.java  |  63 ++++-----
 .../shell/commands/CreateTableCommand.java      |   2 +-
 .../apache/accumulo/test/HardListIterator.java  | 115 +++++++++++++++++
 .../accumulo/test/ConditionalWriterIT.java      |   2 +-
 .../test/CreateTableWithNewTableConfigIT.java   |   2 +-
 .../org/apache/accumulo/test/NamespacesIT.java  |   2 +-
 .../apache/accumulo/test/TableOperationsIT.java | 127 +++++++++++++++++++
 .../java/org/apache/accumulo/test/VolumeIT.java |   2 +-
 .../accumulo/test/functional/LogicalTimeIT.java |   2 +-
 .../accumulo/test/functional/MergeIT.java       |   2 +-
 .../test/replication/CyclicReplicationIT.java   |   2 +-
 36 files changed, 423 insertions(+), 226 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd6dbba5/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd6dbba5/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd6dbba5/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd6dbba5/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd6dbba5/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------