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/01405d5d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/01405d5d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/01405d5d Branch: refs/heads/master Commit: 01405d5d6cbf52ac9e3e9ab6229ffc8fb6ba68a2 Parents: 2f329e0 8445d02 Author: maryannxue <maryann....@gmail.com> Authored: Fri May 20 12:24:32 2016 -0400 Committer: maryannxue <maryann....@gmail.com> Committed: Fri May 20 12:24:32 2016 -0400 ---------------------------------------------------------------------- bin/sqlline.py | 2 +- bin/tephra | 2 +- phoenix-assembly/src/build/client-spark.xml | 2 +- phoenix-assembly/src/build/client.xml | 2 +- .../components/all-common-dependencies.xml | 1 - phoenix-assembly/src/build/server.xml | 3 +-- phoenix-core/pom.xml | 12 ++++------ .../phoenix/end2end/AutoPartitionViewsIT.java | 8 +++---- .../org/apache/phoenix/tx/TransactionIT.java | 8 +++---- .../org/apache/phoenix/tx/TxCheckpointIT.java | 2 +- .../phoenix/cache/IndexMetaDataCache.java | 2 +- .../coprocessor/BaseScannerRegionObserver.java | 2 +- .../coprocessor/MetaDataEndpointImpl.java | 4 ++-- .../phoenix/coprocessor/MetaDataProtocol.java | 2 +- .../PhoenixTransactionalProcessor.java | 2 +- .../phoenix/coprocessor/ScanRegionObserver.java | 2 +- .../UngroupedAggregateRegionObserver.java | 2 +- .../apache/phoenix/execute/MutationState.java | 23 ++++++++++---------- .../apache/phoenix/index/IndexMaintainer.java | 2 +- .../index/IndexMetaDataCacheFactory.java | 2 +- .../phoenix/index/PhoenixIndexMetaData.java | 2 +- .../index/PhoenixTransactionalIndexer.java | 9 ++++---- .../apache/phoenix/jdbc/PhoenixConnection.java | 2 +- .../phoenix/query/ConnectionQueryServices.java | 2 +- .../query/ConnectionQueryServicesImpl.java | 23 +++++++++++++++----- .../query/ConnectionlessQueryServicesImpl.java | 6 ++--- .../query/DelegateConnectionQueryServices.java | 2 +- .../apache/phoenix/schema/MetaDataClient.java | 2 +- .../org/apache/phoenix/schema/PTableImpl.java | 2 +- .../apache/phoenix/schema/TableProperty.java | 8 ++++++- .../java/org/apache/phoenix/util/IndexUtil.java | 2 +- .../org/apache/phoenix/util/PhoenixRuntime.java | 2 +- .../apache/phoenix/util/TransactionUtil.java | 9 ++++---- .../java/org/apache/phoenix/query/BaseTest.java | 10 ++++----- phoenix-flume/pom.xml | 2 +- phoenix-pherf/pom.xml | 2 +- phoenix-pig/pom.xml | 2 +- phoenix-server/pom.xml | 2 +- phoenix-spark/pom.xml | 2 +- pom.xml | 19 ++++++++-------- 40 files changed, 101 insertions(+), 94 deletions(-) ----------------------------------------------------------------------
