hbase/hbase-shell/src
chenheng 96e9c466d2 HBASE-15406 Split / merge switch left disabled after early termination of hbck
Conflicts:
        hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
        hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
        hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
        hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java
        hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java
        hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
        hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
        hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSplitOrMergeStatus.java
        hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java
2016-04-15 15:34:43 +08:00
..
main/ruby HBASE-15406 Split / merge switch left disabled after early termination of hbck 2016-04-15 15:34:43 +08:00
test HBASE-15633 Backport HBASE-15507 to branch-1 (Geoffrey Jacoby) 2016-04-13 02:25:32 -07:00