Repository: hbase Updated Branches: refs/heads/branch-1.2 34f852ab2 -> d4388ba01
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/d4388ba0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d4388ba0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d4388ba0 Branch: refs/heads/branch-1.2 Commit: d4388ba0101928d1d272b2e88dddfd5203400ee8 Parents: 34f852a Author: Jonathan M Hsieh <jmhs...@apache.org> Authored: Thu Feb 18 07:17:10 2016 -0800 Committer: Jonathan M Hsieh <jmhs...@apache.org> Committed: Thu Feb 18 07:19:14 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/d4388ba0/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;
