Repository: hbase
Updated Branches:
refs/heads/0.98 9c3fa44ec -> 16ada3370
HBASE-13897 OOM may occur when Import imports a row with too many KeyValues
(Liu Junhong)
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java
Reapply with fixup
Amending-Author
Repository: hbase
Updated Branches:
refs/heads/0.98 0cd94f2f4 -> 372b71b7f
HBASE-13897 OOM may occur when Import imports a row with too many KeyValues
(Liu Junhong)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/372b71b7
Repository: hbase
Updated Branches:
refs/heads/0.98 b51f980ee -> 9be31d052
HBASE-13897 OOM may occur when Import imports a row with too many KeyValues
(Liu Junhong)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9be31d05
Repository: hbase
Updated Branches:
refs/heads/branch-1 4e84ac792 -> 7ab78d9dd
HBASE-13897 OOM may occur when Import imports a row with too many KeyValues
(Liu Junhong)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7ab7
Repository: hbase
Updated Branches:
refs/heads/master 7acb061e6 -> 1162cbdf1
HBASE-13897 OOM may occur when Import imports a row with too many KeyValues
(Liu Junhong)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1162cb