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 75F081167B for ; Mon, 11 Aug 2014 01:11:38 +0000 (UTC) Received: (qmail 68068 invoked by uid 500); 11 Aug 2014 01:11:36 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 67992 invoked by uid 500); 11 Aug 2014 01:11:36 -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 67703 invoked by uid 99); 11 Aug 2014 01:11:36 -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, 11 Aug 2014 01:11:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 41B0C9A9FB0; Mon, 11 Aug 2014 01:11:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Mon, 11 Aug 2014 01:11:51 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [18/18] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.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/5205ce66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5205ce66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5205ce66 Branch: refs/heads/trunk Commit: 5205ce669fd43560cd8c6cf4f9c13b665fb34121 Parents: 25411bf f2f2d47 Author: Aleksey Yeschenko Authored: Mon Aug 11 01:08:53 2014 +0300 Committer: Aleksey Yeschenko Committed: Mon Aug 11 01:08:53 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 4 +- NEWS.txt | 5 +- build.xml | 2 +- debian/changelog | 6 ++ .../cql3/functions/BytesConversionFcts.java | 22 ++++- .../cassandra/cql3/functions/FunctionCall.java | 23 ++++- .../apache/cassandra/db/RangeTombstoneList.java | 79 +++++++++++++++--- .../cassandra/hadoop/pig/CqlNativeStorage.java | 17 ++++ test/system/test_thrift_server.py | 49 +++++------ .../cassandra/db/RangeTombstoneListTest.java | 88 ++++++++++++++++++++ 10 files changed, 247 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5205ce66/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5205ce66/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5205ce66/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5205ce66/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5205ce66/test/system/test_thrift_server.py ----------------------------------------------------------------------