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/507c7270 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/507c7270 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/507c7270 Branch: refs/heads/txn Commit: 507c7270cf29d9a6334914d711a1c4cadf227a4f Parents: 21c12b1 8d41ab0 Author: maryannxue <[email protected]> Authored: Thu Nov 19 13:44:06 2015 -0500 Committer: maryannxue <[email protected]> Committed: Thu Nov 19 13:44:06 2015 -0500 ---------------------------------------------------------------------- .../hbase/regionserver/LocalIndexSplitter.java | 12 +++++- .../UngroupedAggregateRegionObserver.java | 31 ++++++++++----- .../org/apache/phoenix/jdbc/PhoenixDriver.java | 41 ++++---------------- 3 files changed, 38 insertions(+), 46 deletions(-) ----------------------------------------------------------------------
