Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9A830200B62 for ; Thu, 7 Jul 2016 12:50:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 99248160A68; Thu, 7 Jul 2016 10:50:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D2078160A7D for ; Thu, 7 Jul 2016 12:50:49 +0200 (CEST) Received: (qmail 30050 invoked by uid 500); 7 Jul 2016 10:50:48 -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 29680 invoked by uid 99); 7 Jul 2016 10:50:48 -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; Thu, 07 Jul 2016 10:50:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1F353E0844; Thu, 7 Jul 2016 10:50:48 +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: Thu, 07 Jul 2016 10:50:53 -0000 Message-Id: In-Reply-To: <284195ffce69456ab0dfe70fdf5d7f4d@git.apache.org> References: <284195ffce69456ab0dfe70fdf5d7f4d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9 archived-at: Thu, 07 Jul 2016 10:50:50 -0000 Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: NPE when trying to remove purgable tombstones from result Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/376dae26 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/376dae26 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/376dae26 Branch: refs/heads/cassandra-3.9 Commit: 376dae26833591303cd3140001666f23aa216a11 Parents: 59ee46e 30f5d44 Author: Sylvain Lebresne Authored: Thu Jul 7 12:50:26 2016 +0200 Committer: Sylvain Lebresne Committed: Thu Jul 7 12:50:26 2016 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------