Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1e606d57 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1e606d57 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1e606d57 Branch: refs/heads/master Commit: 1e606d579965b97254f2c30399ace004a8912a31 Parents: ade12a7 c398e18 Author: maryannxue <wei....@intel.com> Authored: Sat Jul 4 14:05:00 2015 -0400 Committer: maryannxue <wei....@intel.com> Committed: Sat Jul 4 14:05:00 2015 -0400 ---------------------------------------------------------------------- .../util/PhoenixConfigurationUtilTest.java | 28 +++++++++++++-- .../org/apache/phoenix/util/QueryUtilTest.java | 36 ++++++++++++++++++-- 2 files changed, 58 insertions(+), 6 deletions(-) ----------------------------------------------------------------------