HBASE-20734 Colocate recovered edits directory with hbase.wal.dir
Signed-off-by: Andrew Purtell
Signed-off-by: Reid Chan
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://g
Repository: hbase
Updated Branches:
refs/heads/branch-2.1 ba8a25216 -> 504286d55
HBASE-20734 Colocate recovered edits directory with hbase.wal.dir
Amending-Author: Reid Chan
Signed-off-by: Reid Chan
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache
Repository: hbase
Updated Branches:
refs/heads/branch-1.4 4be1bf649 -> ca269d346
HBASE-20734 Colocate recovered edits directory with hbase.wal.dir
Signed-off-by: Andrew Purtell
Signed-off-by: Reid Chan
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apa
Repository: hbase
Updated Branches:
refs/heads/branch-1 c6a133452 -> a00adb0b4
HBASE-20734 Colocate recovered edits directory with hbase.wal.dir
Signed-off-by: Andrew Purtell
Signed-off-by: Reid Chan
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apach
Repository: hbase
Updated Branches:
refs/heads/branch-2 0f514ab75 -> 21fafbaf5
HBASE-20734 Colocate recovered edits directory with hbase.wal.dir
Amending-Author: Reid Chan
Signed-off-by: Reid Chan
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.o
Repository: hbase
Updated Branches:
refs/heads/master 08c4d70aa -> 0e173d38b
HBASE-20734 Colocate recovered edits directory with hbase.wal.dir
Signed-off-by: Reid Chan
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0e17