Merge branch 'master' into txn
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/71f10f6d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/71f10f6d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/71f10f6d Branch: refs/heads/txn Commit: 71f10f6dff99e5e116bf7c14dfd3c0774811b70e Parents: cd0632f a9a9b24 Author: Thomas D'Silva <[email protected]> Authored: Wed Nov 4 11:33:43 2015 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Wed Nov 4 11:33:43 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/phoenix/pherf/PherfConstants.java | 10 +++++++++- .../java/org/apache/phoenix/pherf/result/ResultUtil.java | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
