merge txn changes
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/626ac297 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/626ac297 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/626ac297 Branch: refs/heads/txn Commit: 626ac29712de62ad37f6694cd6a261509613a10e Parents: 38aeb5f c5ec69e Author: Thomas D'Silva <[email protected]> Authored: Mon Nov 9 11:31:57 2015 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Mon Nov 9 11:31:57 2015 -0800 ---------------------------------------------------------------------- .../apache/phoenix/end2end/index/IndexIT.java | 2 ++ .../index/PhoenixTransactionalIndexer.java | 29 +++++++++++++------- .../org/apache/phoenix/schema/PTableImpl.java | 21 ++++++++++---- pom.xml | 2 +- 4 files changed, 38 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/626ac297/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/626ac297/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/626ac297/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/626ac297/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 7d95158,54821b2..643f813 --- a/pom.xml +++ b/pom.xml @@@ -104,16 -98,12 +104,16 @@@ <findbugs.version>1.3.2</findbugs.version> <jline.version>2.11</jline.version> <snappy.version>0.3</snappy.version> - <netty.version>3.6.6.Final</netty.version> + <netty.version>4.0.23.Final</netty.version> <commons-codec.version>1.7</commons-codec.version> - <htrace.version>2.04</htrace.version> + <htrace.version>3.1.0-incubating</htrace.version> <collections.version>3.2.1</collections.version> <jodatime.version>2.3</jodatime.version> + <jodatime.version>2.7</jodatime.version> + <joni.version>2.1.2</joni.version> + <calcite.version>1.3.0-incubating</calcite.version> + <jettyVersion>8.1.7.v20120910</jettyVersion> - <tephra.version>0.6.3-SNAPSHOT</tephra.version> + <tephra.version>0.6.3</tephra.version> <!-- Test Dependencies --> <mockito-all.version>1.8.5</mockito-all.version>
