You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/08/18 20:17:26 UTC

hbase git commit: Fixup post merge

Repository: hbase
Updated Branches:
  refs/heads/HBASE-14070.HLC c9cc17dd7 -> e9d962a87


Fixup post merge


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

Branch: refs/heads/HBASE-14070.HLC
Commit: e9d962a876e71ba5f3084d1338fe997b275ae506
Parents: c9cc17d
Author: Michael Stack <st...@apache.org>
Authored: Fri Aug 18 13:17:21 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Fri Aug 18 13:17:21 2017 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e9d962a8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 59de679..1c1b26a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -7732,7 +7732,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
   public static final long FIXED_OVERHEAD = ClassSize.align(
       ClassSize.OBJECT +
       ClassSize.ARRAY +
-      51 * ClassSize.REFERENCE + 2 * Bytes.SIZEOF_INT +
+      52 * ClassSize.REFERENCE + 2 * Bytes.SIZEOF_INT +
       (15 * Bytes.SIZEOF_LONG) +
       6 * Bytes.SIZEOF_BOOLEAN);