You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by mu...@apache.org on 2015/03/13 18:41:05 UTC

[6/6] phoenix git commit: Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0

Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/46d365a9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/46d365a9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/46d365a9

Branch: refs/heads/4.0
Commit: 46d365a96515a37bf93e318bb1e1d8d1a11b24df
Parents: 4b51655 82d6fb9
Author: Mujtaba <mu...@apache.org>
Authored: Fri Mar 13 10:40:18 2015 -0700
Committer: Mujtaba <mu...@apache.org>
Committed: Fri Mar 13 10:40:18 2015 -0700

----------------------------------------------------------------------
 .../wal/ReadWriteKeyValuesWithCodecIT.java      |  14 +-
 .../org/apache/phoenix/end2end/BaseViewIT.java  |   1 +
 .../end2end/QueryDatabaseMetaDataIT.java        | 216 +++++++++----------
 .../phoenix/end2end/StatsCollectorIT.java       |   1 +
 .../StatsCollectorWithSplitsAndMultiCFIT.java   |   1 +
 .../EndToEndCoveredColumnsIndexBuilderIT.java   |   6 +-
 .../regionserver/IndexSplitTransaction.java     |   2 +-
 .../coprocessor/MetaDataEndpointImpl.java       |   2 +-
 .../coprocessor/SequenceRegionObserver.java     |   2 +-
 .../hbase/index/balancer/IndexLoadBalancer.java |   2 +-
 .../covered/CoveredColumnsIndexBuilder.java     |   2 +-
 .../java/org/apache/phoenix/job/JobManager.java |   5 +-
 .../query/ConnectionQueryServicesImpl.java      |   1 +
 .../phoenix/util/DefaultEnvironmentEdge.java    |  34 +++
 .../apache/phoenix/util/EnvironmentEdge.java    |  34 +++
 .../phoenix/util/EnvironmentEdgeManager.java    |  74 +++++++
 16 files changed, 268 insertions(+), 129 deletions(-)
----------------------------------------------------------------------