You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/06/01 17:35:04 UTC

hbase git commit: HBASE-15932 Shell test fails due to uninitialized constant

Repository: hbase
Updated Branches:
  refs/heads/master 015f2ef62 -> cbb95cd3a


HBASE-15932 Shell test fails due to uninitialized constant


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cbb95cd3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cbb95cd3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cbb95cd3

Branch: refs/heads/master
Commit: cbb95cd3a9bf9a9f8558560ae58f4061a73f15a8
Parents: 015f2ef
Author: tedyu <yu...@gmail.com>
Authored: Wed Jun 1 10:35:00 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed Jun 1 10:35:00 2016 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java   | 2 +-
 hbase-shell/src/main/ruby/hbase.rb                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/cbb95cd3/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
index 799bf0b..b75e8cd 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
@@ -64,7 +64,7 @@ public class HColumnDescriptor implements Comparable<HColumnDescriptor> {
   // Version 11 -- add column family level configuration.
   private static final byte COLUMN_DESCRIPTOR_VERSION = (byte) 11;
 
-  private static final String IN_MEMORY_COMPACTION = "IN_MEMORY_COMPACTION";
+  public static final String IN_MEMORY_COMPACTION = "IN_MEMORY_COMPACTION";
 
   // These constants are used as FileInfo keys
   public static final String COMPRESSION = "COMPRESSION";

http://git-wip-us.apache.org/repos/asf/hbase/blob/cbb95cd3/hbase-shell/src/main/ruby/hbase.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase.rb b/hbase-shell/src/main/ruby/hbase.rb
index 189fa3a..bc6f37c 100644
--- a/hbase-shell/src/main/ruby/hbase.rb
+++ b/hbase-shell/src/main/ruby/hbase.rb
@@ -39,7 +39,7 @@ module HBaseConstants
   NAME = org.apache.hadoop.hbase.HConstants::NAME
   VERSIONS = org.apache.hadoop.hbase.HConstants::VERSIONS
   IN_MEMORY = org.apache.hadoop.hbase.HConstants::IN_MEMORY
-  IN_MEMORY_COMPACTION = org.apache.hadoop.hbase.HConstants::IN_MEMORY_COMPACTION
+  IN_MEMORY_COMPACTION = org.apache.hadoop.hbase.HColumnDescriptor::IN_MEMORY_COMPACTION
   METADATA = org.apache.hadoop.hbase.HConstants::METADATA
   STOPROW = "STOPROW"
   STARTROW = "STARTROW"