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/8520328d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8520328d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8520328d

Branch: refs/heads/master
Commit: 8520328d439af457a03c5f849b14638130f349c5
Parents: cffb86d 344fe21
Author: Sean Busbey <bus...@cloudera.com>
Authored: Tue Apr 15 11:12:46 2014 -0500
Committer: Sean Busbey <bus...@cloudera.com>
Committed: Tue Apr 15 11:12:46 2014 -0500

----------------------------------------------------------------------
 test/pom.xml                                    | 12 +++++++
 .../accumulo/test/functional/AbstractMacIT.java | 36 ++++++++++++++++++++
 .../accumulo/test/functional/AddSplitIT.java    |  7 +++-
 .../test/functional/BackupMasterIT.java         |  7 +++-
 .../test/functional/BadIteratorMincIT.java      |  7 +++-
 .../functional/BalanceAfterCommsFailureIT.java  |  7 +++-
 .../test/functional/BatchScanSplitIT.java       |  7 +++-
 .../test/functional/BatchWriterFlushIT.java     |  7 +++-
 .../test/functional/BigRootTabletIT.java        |  7 +++-
 .../accumulo/test/functional/BinaryIT.java      |  9 +++--
 .../test/functional/BinaryStressIT.java         |  7 +++-
 .../accumulo/test/functional/BloomFilterIT.java |  7 +++-
 .../accumulo/test/functional/BulkFileIT.java    |  7 +++-
 .../apache/accumulo/test/functional/BulkIT.java |  7 +++-
 .../functional/BulkSplitOptimizationIT.java     |  7 +++-
 .../test/functional/ChaoticBalancerIT.java      |  7 +++-
 .../accumulo/test/functional/ClassLoaderIT.java |  7 +++-
 .../accumulo/test/functional/CleanTmpIT.java    |  7 +++-
 .../accumulo/test/functional/CleanUpIT.java     |  8 ++++-
 .../accumulo/test/functional/CloneTestIT.java   |  9 +++--
 .../accumulo/test/functional/CombinerIT.java    |  7 +++-
 .../accumulo/test/functional/CompactionIT.java  |  7 +++-
 .../accumulo/test/functional/ConcurrencyIT.java |  7 +++-
 .../accumulo/test/functional/ConstraintIT.java  |  7 +++-
 .../test/functional/CreateAndUseIT.java         |  7 +++-
 .../test/functional/CreateManyScannersIT.java   |  7 +++-
 .../test/functional/DeleteEverythingIT.java     |  7 +++-
 .../accumulo/test/functional/DeleteIT.java      |  7 +++-
 .../accumulo/test/functional/DeleteRowsIT.java  |  8 ++++-
 .../test/functional/DeleteRowsSplitIT.java      |  7 +++-
 .../functional/DeleteTableDuringSplitIT.java    |  7 +++-
 .../test/functional/DynamicThreadPoolsIT.java   |  7 +++-
 .../test/functional/FateStarvationIT.java       |  7 +++-
 .../test/functional/HalfDeadTServerIT.java      |  9 +++--
 .../accumulo/test/functional/LargeRowIT.java    |  7 +++-
 .../test/functional/LateLastContactIT.java      |  7 +++-
 .../accumulo/test/functional/LogicalTimeIT.java |  7 +++-
 .../accumulo/test/functional/MapReduceIT.java   |  8 ++++-
 .../test/functional/MasterAssignmentIT.java     |  7 +++-
 .../test/functional/MasterFailoverIT.java       |  7 +++-
 .../accumulo/test/functional/MaxOpenIT.java     |  7 +++-
 .../test/functional/MetadataMaxFiles.java       |  7 +++-
 .../test/functional/MetadataSplitIT.java        |  9 +++--
 .../accumulo/test/functional/ReadWriteIT.java   | 19 +++++++----
 .../accumulo/test/functional/RenameIT.java      |  7 +++-
 .../test/functional/RestartStressIT.java        |  7 +++-
 .../accumulo/test/functional/RowDeleteIT.java   |  8 +++--
 .../test/functional/ScanIteratorIT.java         |  7 +++-
 .../accumulo/test/functional/ScanRangeIT.java   |  7 +++-
 .../test/functional/ScanSessionTimeOutIT.java   |  7 +++-
 .../accumulo/test/functional/ScannerIT.java     |  7 +++-
 .../test/functional/ServerSideErrorIT.java      |  7 +++-
 .../accumulo/test/functional/ShutdownIT.java    | 13 ++++---
 .../functional/SimpleBalancerFairnessIT.java    |  7 +++-
 .../test/functional/SparseColumnFamilyIT.java   |  7 +++-
 .../accumulo/test/functional/SplitIT.java       | 11 ++++--
 .../test/functional/SplitRecoveryIT.java        |  6 +++-
 .../accumulo/test/functional/StartIT.java       |  7 +++-
 .../accumulo/test/functional/TableIT.java       |  7 +++-
 .../accumulo/test/functional/TabletIT.java      |  7 +++-
 .../accumulo/test/functional/TimeoutIT.java     |  7 +++-
 .../accumulo/test/functional/VisibilityIT.java  |  7 +++-
 .../test/functional/WriteAheadLogIT.java        |  7 +++-
 .../accumulo/test/functional/WriteLotsIT.java   |  7 +++-
 .../accumulo/test/functional/ZooCacheIT.java    |  7 +++-
 .../test/functional/ZookeeperRestartIT.java     |  7 +++-
 66 files changed, 449 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/ScanRangeIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8520328d/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java
----------------------------------------------------------------------

Reply via email to