Conflicts: hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Amending-Author: Andrew Purtell <apurtell@apache.org>
Conflicts: hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Amending-Author: Andrew Purtell <apurtell@apache.org>