From 7b4646fe3dc44607d33c7a05112e5e1a7cf5649c Mon Sep 17 00:00:00 2001 From: Jonathan M Hsieh Date: Thu, 18 Feb 2016 07:17:10 -0800 Subject: [PATCH] HBASE-15285 ADDENDUM make RETURN_RESULTS attribute name protected to match branch-1.1 and deprecated to warn of 2.0 (Sean Busbey) --- .../main/java/org/apache/hadoop/hbase/client/Mutation.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 138a0fec463..d11c4591692 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;