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/aaab87a8 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/aaab87a8 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/aaab87a8 Branch: refs/heads/calcite Commit: aaab87a88f162384cbd94ab1703f7fc5daec5751 Parents: de4f174 bd06dfb Author: maryannxue <maryann....@gmail.com> Authored: Tue Jan 26 20:27:17 2016 -0500 Committer: maryannxue <maryann....@gmail.com> Committed: Tue Jan 26 20:27:17 2016 -0500 ---------------------------------------------------------------------- .../query/ConnectionQueryServicesImpl.java | 82 ++++---------------- .../phoenix/query/QueryServicesOptions.java | 2 +- 2 files changed, 14 insertions(+), 70 deletions(-) ----------------------------------------------------------------------
