[phoenix] branch master updated: PHOENIX-5881 (addendum)

[gjacoby]

This is an automated email from the ASF dual-hosted git repository.

gjacoby pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new 80a417b  PHOENIX-5881 (addendum)
80a417b is described below

commit 80a417b48d6fb645155d58e78465f4ee820440e6
Author: Geoffrey Jacoby <gjac...@apache.org>
AuthorDate: Fri Aug 21 14:28:13 2020 -0700

    PHOENIX-5881 (addendum)
---
 .../compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java       | 2 +-
 .../compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
 
b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
index 20aaf20..a3d12a4 100644
--- 
a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
+++ 
b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
@@ -62,7 +62,7 @@ public class CompatBaseScannerRegionObserver implements 
RegionObserver {
         //to "look behind" delete markers on SCN queries
     }
 
-    public long getMaxLookbackInMillis(Configuration conf){
+    public static long getMaxLookbackInMillis(Configuration conf){
         //config param is in seconds, switch to millis
         return conf.getLong(PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY,
             DEFAULT_PHOENIX_MAX_LOOKBACK_AGE) * 1000;
diff --git 
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
 
b/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
index 00c2501..2f901ae 100644
--- 
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
+++ 
b/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
@@ -62,7 +62,7 @@ public class CompatBaseScannerRegionObserver implements 
RegionObserver {
         //to "look behind" delete markers on SCN queries
     }
 
-    public long getMaxLookbackInMillis(Configuration conf){
+    public static long getMaxLookbackInMillis(Configuration conf){
         //config param is in seconds, switch to millis
         return conf.getLong(PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY,
                 DEFAULT_PHOENIX_MAX_LOOKBACK_AGE) * 1000;