Merge branch 'branch-2' of https://git-wip-us.apache.org/repos/asf/hbase into branch-2

2017-10-01 16:23:57 +03:00 · 2017-10-01 16:23:57 +03:00 · 6cf647a0df
parent 445c5bd7b7 f04bd9ca18
commit 6cf647a0df
1 changed files with 1 additions and 1 deletions
--- a/hbase-shell/src/main/ruby/hbase/table.rb
+++ b/hbase-shell/src/main/ruby/hbase/table.rb
@ -748,7 +748,7 @@ EOF
        end
      end

-      if kv.isDelete
+      if org.apache.hadoop.hbase.CellUtil.isDelete(kv)
        val = "timestamp=#{kv.getTimestamp}, type=#{org.apache.hadoop.hbase.KeyValue::Type.codeToType(kv.getType)}"
      else
        val = "timestamp=#{kv.getTimestamp}, value=#{convert(column, kv, converter_class, converter)}"