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 2461017C86 for ; Wed, 3 Jun 2015 12:25:26 +0000 (UTC) Received: (qmail 50538 invoked by uid 500); 3 Jun 2015 12:25:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 50464 invoked by uid 500); 3 Jun 2015 12:25:25 -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 50168 invoked by uid 99); 3 Jun 2015 12:25:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jun 2015 12:25:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8797BDFFF2; Wed, 3 Jun 2015 12:25:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Wed, 03 Jun 2015 12:25:28 -0000 Message-Id: <599fae43fb6740b29281e0a076e1a971@git.apache.org> In-Reply-To: <776494b7b2f34014981ec0ddb7d8d967@git.apache.org> References: <776494b7b2f34014981ec0ddb7d8d967@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra git commit: Merge branch 'cassandra-2.2' into trunk Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86c7785a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86c7785a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86c7785a Branch: refs/heads/trunk Commit: 86c7785af24fe2cb7189785e8aea3cd926050d3f Parents: 36e4f4f 4c53dc3 Author: Sylvain Lebresne Authored: Wed Jun 3 14:25:04 2015 +0200 Committer: Sylvain Lebresne Committed: Wed Jun 3 14:25:04 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/DeletionTime.java | 5 + .../org/apache/cassandra/db/RangeTombstone.java | 194 +++++++++++++------ .../db/compaction/LazilyCompactedRow.java | 3 + 4 files changed, 149 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86c7785a/CHANGES.txt ----------------------------------------------------------------------