Repository: hbase
Updated Branches:
refs/heads/branch-1 3e3276d7f -> 6e5e5d8cc
HBASE-12562 Handling memory pressure for secondary region replicas
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Project: http://git-wip-us.apache.org/rep
Repository: hbase
Updated Branches:
refs/heads/master ec1eff9b6 -> 4ac42a2f5
HBASE-12562 Handling memory pressure for secondary region replicas
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4ac42a2f
Tree: http://git-wip-