Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B7C709D0F for ; Wed, 29 Feb 2012 20:43:32 +0000 (UTC) Received: (qmail 86497 invoked by uid 500); 29 Feb 2012 20:43:32 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 86464 invoked by uid 500); 29 Feb 2012 20:43:32 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 86455 invoked by uid 99); 29 Feb 2012 20:43:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Feb 2012 20:43:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Feb 2012 20:43:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 632DC4D1E8; Wed, 29 Feb 2012 20:43:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/12] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120229204311.632DC4D1E8@tyr.zones.apache.org> Date: Wed, 29 Feb 2012 20:43:11 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/cassandra-1.1 32f5d0641 -> 2fc2bd393 refs/heads/cassandra-1.1.0 0447837b2 -> 470873fcb refs/heads/trunk 0e701097a -> 4bae17438 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bae1743 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bae1743 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bae1743 Branch: refs/heads/trunk Commit: 4bae174380f9dcc4f79f515506ae498a9a105359 Parents: 0e70109 2fc2bd3 Author: Brandon Williams Authored: Wed Feb 29 14:43:03 2012 -0600 Committer: Brandon Williams Committed: Wed Feb 29 14:43:03 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + examples/pig/test/populate-cli.txt | 20 +++++++++ examples/pig/test/test_storage.pig | 21 ++++++++++ .../db/marshal/AbstractCompositeType.java | 32 +++++++++++++++ .../cassandra/hadoop/pig/CassandraStorage.java | 31 ++++++++++++++- 5 files changed, 105 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bae1743/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bae1743/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ----------------------------------------------------------------------