accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [6/6] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Date Fri, 17 Apr 2015 22:30:53 GMT
Merge branch 'master' of https://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/7480eedf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7480eedf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7480eedf

Branch: refs/heads/master
Commit: 7480eedf6f8c7d083f46e6dfa217b0ad14ec38fd
Parents: 85b3080 a194c0b
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Fri Apr 17 18:30:42 2015 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Fri Apr 17 18:30:42 2015 -0400

----------------------------------------------------------------------
 .../accumulo/core/bloomfilter/Filter.java       | 48 ----------
 .../core/client/impl/ReplicationClient.java     | 41 --------
 .../core/client/impl/ScannerIterator.java       |  5 -
 .../core/client/impl/ScannerOptions.java        |  5 -
 .../accumulo/core/client/impl/Tables.java       |  5 -
 .../accumulo/core/client/mock/MockAccumulo.java |  4 -
 .../accumulo/core/client/mock/MockTable.java    |  6 +-
 .../org/apache/accumulo/core/conf/Property.java | 11 ---
 .../accumulo/core/conf/SiteConfiguration.java   | 17 ----
 .../apache/accumulo/core/data/PartialKey.java   |  2 +
 .../core/file/blockfile/ABlockReader.java       |  2 -
 .../core/file/blockfile/ABlockWriter.java       |  3 -
 .../core/file/blockfile/BlockFileWriter.java    |  2 -
 .../core/file/blockfile/cache/BlockCache.java   |  5 -
 .../core/file/blockfile/cache/CachedBlock.java  |  4 -
 .../core/file/blockfile/cache/ClassSize.java    | 98 --------------------
 .../file/blockfile/cache/LruBlockCache.java     |  1 -
 .../file/blockfile/impl/CachableBlockFile.java  | 28 ------
 .../file/keyfunctor/ColumnFamilyFunctor.java    |  2 +-
 .../accumulo/core/file/rfile/bcfile/BCFile.java | 19 ----
 .../core/file/rfile/bcfile/CompareUtils.java    | 36 -------
 .../accumulo/core/file/rfile/bcfile/Utils.java  | 82 ----------------
 .../core/metadata/schema/MetadataSchema.java    | 14 ---
 .../apache/accumulo/core/rpc/ThriftUtil.java    | 70 --------------
 .../apache/accumulo/core/util/AddressUtil.java  |  4 -
 .../apache/accumulo/core/util/ByteArraySet.java |  4 -
 .../org/apache/accumulo/core/util/Daemon.java   | 20 ----
 .../apache/accumulo/core/util/MapCounter.java   |  4 -
 .../apache/accumulo/core/util/StopWatch.java    | 15 ---
 .../core/volume/VolumeConfiguration.java        |  5 -
 .../simple/mapreduce/TeraSortIngest.java        |  2 -
 .../accumulo/fate/zookeeper/ZooCache.java       |  9 --
 .../apache/accumulo/fate/zookeeper/ZooLock.java | 18 ----
 .../accumulo/fate/zookeeper/ZooQueueLock.java   |  7 --
 .../accumulo/fate/zookeeper/ZooSession.java     |  4 -
 .../impl/MiniAccumuloClusterImpl.java           | 15 +--
 .../impl/ZooKeeperBindException.java            |  8 --
 .../apache/accumulo/server/ServerConstants.java |  4 -
 .../accumulo/server/client/BulkImporter.java    |  9 --
 .../server/conf/NamespaceConfWatcher.java       |  4 -
 .../accumulo/server/conf/TableConfWatcher.java  |  4 -
 .../server/conf/TableParentConfiguration.java   | 10 --
 .../server/conf/ZooConfigurationFactory.java    | 11 ---
 .../accumulo/server/log/SortedLogState.java     |  8 --
 .../accumulo/server/master/LiveTServerSet.java  |  9 --
 .../master/state/DistributedStoreException.java |  3 -
 .../server/master/state/TServerInstance.java    |  4 -
 .../server/master/state/TabletServerState.java  |  5 -
 .../server/metrics/AbstractMetricsImpl.java     |  4 -
 .../server/metrics/MetricsConfiguration.java    | 18 ----
 .../server/replication/StatusFormatter.java     |  5 -
 .../server/rpc/TBufferedServerSocket.java       | 71 --------------
 .../server/rpc/TNonblockingServerSocket.java    |  7 --
 .../server/security/SecurityOperation.java      |  4 -
 .../security/handler/KerberosAuthorizor.java    |  8 --
 .../handler/KerberosPermissionHandler.java      |  8 --
 .../accumulo/server/tables/TableManager.java    |  4 -
 .../accumulo/server/util/AccumuloStatus.java    | 14 ---
 .../accumulo/server/util/CleanZookeeper.java    |  3 -
 .../accumulo/server/util/FileSystemMonitor.java | 12 ---
 .../accumulo/server/util/MetadataTableUtil.java |  5 -
 .../accumulo/server/util/RestoreZookeeper.java  |  2 -
 .../accumulo/server/util/time/RelativeTime.java |  4 -
 .../accumulo/server/util/time/SimpleTimer.java  | 10 --
 .../accumulo/server/zookeeper/ZooCache.java     |  5 -
 .../accumulo/gc/SimpleGarbageCollector.java     |  2 -
 .../org/apache/accumulo/monitor/Monitor.java    | 27 ------
 .../accumulo/monitor/ZooKeeperStatus.java       |  4 -
 .../apache/accumulo/tracer/ZooTraceClient.java  |  3 +-
 .../tserver/ActiveAssignmentRunnable.java       |  4 +-
 .../accumulo/tserver/CompactionQueue.java       | 70 ++++++--------
 .../apache/accumulo/tserver/FileManager.java    |  2 +-
 .../apache/accumulo/tserver/InMemoryMap.java    |  8 +-
 .../org/apache/accumulo/tserver/MemValue.java   | 11 ---
 .../org/apache/accumulo/tserver/NativeMap.java  |  8 +-
 .../accumulo/tserver/RunnableStartedAt.java     |  5 -
 .../org/apache/accumulo/tserver/TLevel.java     |  6 --
 .../apache/accumulo/tserver/TabletServer.java   |  5 -
 .../tserver/TabletServerResourceManager.java    | 52 +----------
 .../accumulo/tserver/TabletStatsKeeper.java     | 12 +--
 .../compaction/MajorCompactionRequest.java      |  7 --
 .../apache/accumulo/tserver/log/DfsLogger.java  | 16 +---
 .../tserver/log/TabletServerLogger.java         |  9 --
 .../accumulo/tserver/logger/LogFileKey.java     |  4 -
 .../accumulo/tserver/logger/LogFileValue.java   |  4 -
 .../mastermessage/SplitReportMessage.java       | 11 +--
 .../accumulo/tserver/session/Session.java       |  6 +-
 .../apache/accumulo/tserver/tablet/Rate.java    |  4 -
 .../apache/accumulo/tserver/tablet/Tablet.java  |  8 --
 .../java/org/apache/accumulo/shell/Shell.java   | 16 ----
 .../accumulo/shell/ShellCommandException.java   |  4 -
 .../apache/accumulo/shell/ShellCompletor.java   |  4 -
 .../org/apache/accumulo/shell/ShellOptions.java |  3 -
 .../java/org/apache/accumulo/shell/Token.java   |  6 --
 .../accumulo/shell/commands/CompactCommand.java |  2 -
 .../accumulo/shell/commands/ScanCommand.java    |  9 --
 96 files changed, 67 insertions(+), 1145 deletions(-)
----------------------------------------------------------------------



Mime
View raw message