04a4ac5ae9
Signed-off-by: Liangjun He <heliangjun@apache.org> Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org> (cherry picked from commit 31c4aea48c3d4bc7585784dd65375edbb4e61a8a) Conflicts: hbase-client/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationPeerConfig.java hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/ReplicationPeerStorageTestBase.java