1bd27bfa24
Signed-off-by: stack <stack@apache.org> Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java