Merge remote-tracking branch 'origin/master' into calcite
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/54268354 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/54268354 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/54268354 Branch: refs/heads/calcite Commit: 54268354008472ec2e2ccf789d83199d106f8deb Parents: e0dc286 05bae1f Author: maryannxue <[email protected]> Authored: Fri Apr 8 11:53:39 2016 -0400 Committer: maryannxue <[email protected]> Committed: Fri Apr 8 11:53:39 2016 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/execute/UnnestArrayPlan.java | 2 +- .../test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/54268354/phoenix-core/src/main/java/org/apache/phoenix/execute/UnnestArrayPlan.java ----------------------------------------------------------------------
