Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9DEF2106A2 for ; Wed, 12 Feb 2014 22:00:41 +0000 (UTC) Received: (qmail 4195 invoked by uid 500); 12 Feb 2014 22:00:36 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 4172 invoked by uid 500); 12 Feb 2014 22:00:36 -0000 Mailing-List: contact commits-help@phoenix.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.incubator.apache.org Delivered-To: mailing list commits@phoenix.incubator.apache.org Received: (qmail 4119 invoked by uid 99); 12 Feb 2014 22:00:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Feb 2014 22:00:33 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 12 Feb 2014 22:00:32 +0000 Received: (qmail 3254 invoked by uid 99); 12 Feb 2014 22:00:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Feb 2014 22:00:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E32F1826EDE; Wed, 12 Feb 2014 22:00:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jamestaylor@apache.org To: commits@phoenix.incubator.apache.org Date: Wed, 12 Feb 2014 22:00:12 -0000 Message-Id: <960e9ac1d0214bcda89c38785f754dd2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix X-Virus-Checked: Checked by ClamAV on apache.org 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/91b7f6d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/91b7f6d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/91b7f6d4 Branch: refs/heads/master Commit: 91b7f6d45f9b2a2a92ca2d43b58fc71a0feceaa4 Parents: 9b0a112 88c8b99 Author: James Taylor Authored: Wed Feb 12 13:59:52 2014 -0800 Committer: James Taylor Committed: Wed Feb 12 13:59:52 2014 -0800 ---------------------------------------------------------------------- .../phoenix/parse/CreateIndexStatement.java | 2 +- .../apache/phoenix/end2end/HashJoinTest.java | 30 ++++++++++---------- .../java/org/apache/phoenix/util/TestUtil.java | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) ----------------------------------------------------------------------