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 6A147F801 for ; Mon, 28 Apr 2014 16:36:26 +0000 (UTC) Received: (qmail 48116 invoked by uid 500); 28 Apr 2014 16:36:19 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 48050 invoked by uid 500); 28 Apr 2014 16:36:19 -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 47878 invoked by uid 99); 28 Apr 2014 16:36:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Apr 2014 16:36:16 +0000 X-ASF-Spam-Status: No, hits=-2000.7 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; Mon, 28 Apr 2014 16:36:15 +0000 Received: (qmail 47418 invoked by uid 99); 28 Apr 2014 16:35:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Apr 2014 16:35:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0CB2A9989FF; Mon, 28 Apr 2014 16:35:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: maryannxue@apache.org To: commits@phoenix.incubator.apache.org Date: Mon, 28 Apr 2014 16:35:55 -0000 Message-Id: <1083d0f8d925414c9e48f0e6fa0071b6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch '3.0' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix into 3.0 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch '3.0' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix into 3.0 Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/24c8e04f Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/24c8e04f Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/24c8e04f Branch: refs/heads/3.0 Commit: 24c8e04fce1f6601e765bedfb5b283e1f8c7ceb9 Parents: 62dd241 4d1526d Author: maryannxue Authored: Mon Apr 28 12:35:44 2014 -0400 Committer: maryannxue Committed: Mon Apr 28 12:35:44 2014 -0400 ---------------------------------------------------------------------- bin/performance.py | 17 +- bin/phoenix_utils.py | 20 ++ bin/psql.py | 12 +- bin/readme.txt | 6 +- bin/sqlline.py | 12 +- dev/make_rc.sh | 133 +++++++++++ dev/release_files/LICENSE | 228 +++++++++++++++++++ dev/release_files/NOTICE | 49 ++++ phoenix-pig/pom.xml | 76 ++++++- .../phoenix/pig/PhoenixHBaseLoaderIT.java | 5 +- .../phoenix/pig/PhoenixHBaseStorerIT.java | 7 +- pom.xml | 1 + 12 files changed, 525 insertions(+), 41 deletions(-) ----------------------------------------------------------------------