You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@phoenix.apache.org by je...@apache.org on 2014/03/10 05:21:43 UTC

[12/36] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix

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


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

Branch: refs/heads/4.0
Commit: f95a97f1a75fa9f2e57ef550769f5fb4ff22db45
Parents: 4ca3cae 2d3989f
Author: James Taylor <ja...@apache.org>
Authored: Wed Mar 5 20:44:32 2014 -0800
Committer: James Taylor <ja...@apache.org>
Committed: Wed Mar 5 20:44:32 2014 -0800

----------------------------------------------------------------------
 .../phoenix/iterate/ParallelIterators.java      | 52 +++++++-------------
 .../java/org/apache/phoenix/parse/HintNode.java | 13 ++++-
 2 files changed, 31 insertions(+), 34 deletions(-)
----------------------------------------------------------------------