You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/12/21 04:28:45 UTC
[9/9] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Merge remote-tracking branch 'origin/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/2d8a2ecb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d8a2ecb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2d8a2ecb
Branch: refs/heads/master
Commit: 2d8a2ecb8fd90458eb9702d5db3215c539070882
Parents: 551c650 3aace98
Author: Keith Turner <kt...@apache.org>
Authored: Fri Dec 20 22:27:43 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Fri Dec 20 22:27:43 2013 -0500
----------------------------------------------------------------------
.../1GB/native-standalone/accumulo-env.sh | 2 +-
conf/examples/1GB/standalone/accumulo-env.sh | 2 +-
.../2GB/native-standalone/accumulo-env.sh | 2 +-
conf/examples/2GB/standalone/accumulo-env.sh | 2 +-
.../3GB/native-standalone/accumulo-env.sh | 2 +-
conf/examples/3GB/standalone/accumulo-env.sh | 2 +-
.../512MB/native-standalone/accumulo-env.sh | 2 +-
conf/examples/512MB/standalone/accumulo-env.sh | 2 +-
.../gc/GarbageCollectWriteAheadLogs.java | 28 +--
.../monitor/util/celltypes/TableLinkType.java | 14 +-
.../org/apache/accumulo/tserver/Tablet.java | 4 +-
.../apache/accumulo/tserver/TabletServer.java | 18 +-
.../tserver/log/TabletServerLogger.java | 6 +-
test/system/continuous/agitator.pl | 201 -------------------
test/system/continuous/datanode-agitator.pl | 131 ++++++++++++
test/system/continuous/magitator.pl | 85 --------
test/system/continuous/master-agitator.pl | 85 ++++++++
test/system/continuous/start-agitator.sh | 37 +++-
test/system/continuous/stop-agitator.sh | 19 +-
test/system/continuous/tserver-agitator.pl | 129 ++++++++++++
20 files changed, 431 insertions(+), 342 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2d8a2ecb/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------