Repository: hbase Updated Branches: refs/heads/branch-2.0 80724e9ba -> 586f1ea0e
HBASE-20259 Doc configs for in-memory-compaction and add detail to ... ADDENDUM to fix compile Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/586f1ea0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/586f1ea0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/586f1ea0 Branch: refs/heads/branch-2.0 Commit: 586f1ea0e42d82ac40278af38b2d08655f1a8fb2 Parents: 80724e9 Author: Michael Stack <[email protected]> Authored: Tue Apr 3 09:01:51 2018 -0700 Committer: Michael Stack <[email protected]> Committed: Tue Apr 3 09:01:51 2018 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/586f1ea0/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index 3a7218e..351a847 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -340,7 +340,6 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat this.getHRegion().getRegionServicesForStores(), inMemoryCompaction}); } return ms; ->>>>>>> c88ca54c16... HBASE-20259 Doc configs for in-memory-compaction and add detail to } /**
