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 1F93F1047F for ; Mon, 7 Sep 2015 06:19:45 +0000 (UTC) Received: (qmail 60743 invoked by uid 500); 7 Sep 2015 06:19:44 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 60625 invoked by uid 500); 7 Sep 2015 06:19:44 -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 60566 invoked by uid 99); 7 Sep 2015 06:19:44 -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; Mon, 07 Sep 2015 06:19:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7A8BFDFC8D; Mon, 7 Sep 2015 06:19:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Mon, 07 Sep 2015 06:19:45 -0000 Message-Id: <0c1c8c16ecd741e0be9f26fbd8c79301@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2eb7bd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2eb7bd7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2eb7bd7 Branch: refs/heads/cassandra-3.0 Commit: c2eb7bd7ddb83d0a4d4612adb0e3ebd773c8ba67 Parents: acdbdc2 0bb32f0 Author: Marcus Eriksson Authored: Mon Sep 7 07:56:58 2015 +0200 Committer: Marcus Eriksson Committed: Mon Sep 7 07:56:58 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2eb7bd7/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java ----------------------------------------------------------------------