You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2016/02/18 16:19:27 UTC

hbase git commit: HBASE-15285 ADDENDUM make RETURN_RESULTS attribute name protected to match branch-1.1 and deprecated to warn of 2.0 (Sean Busbey)

Repository: hbase
Updated Branches:
  refs/heads/branch-1 7a1c407ea -> 7b4646fe3


HBASE-15285 ADDENDUM make RETURN_RESULTS attribute name protected to match branch-1.1 and deprecated to warn of 2.0 (Sean Busbey)


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

Branch: refs/heads/branch-1
Commit: 7b4646fe3dc44607d33c7a05112e5e1a7cf5649c
Parents: 7a1c407
Author: Jonathan M Hsieh <jm...@apache.org>
Authored: Thu Feb 18 07:17:10 2016 -0800
Committer: Jonathan M Hsieh <jm...@apache.org>
Committed: Thu Feb 18 07:17:10 2016 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/client/Mutation.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/7b4646fe/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
index 138a0fe..d11c459 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
@@ -83,7 +83,11 @@ public abstract class Mutation extends OperationWithAttributes implements Row, C
    */
   private static final String OP_ATTRIBUTE_TTL = "_ttl";
 
-  private static final String RETURN_RESULTS = "_rr_";
+  /**
+   * @deprecated this field is private as of HBase 2.0.
+   */
+  @Deprecated
+  protected static final String RETURN_RESULTS = "_rr_";
 
   protected byte [] row = null;
   protected long ts = HConstants.LATEST_TIMESTAMP;