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 5FB1E18C5E for ; Wed, 23 Mar 2016 13:45:18 +0000 (UTC) Received: (qmail 64752 invoked by uid 500); 23 Mar 2016 13:45:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 63211 invoked by uid 500); 23 Mar 2016 13:45:03 -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 61606 invoked by uid 99); 23 Mar 2016 13:44:43 -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, 23 Mar 2016 13:44:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6627E97E9; Wed, 23 Mar 2016 13:44:41 +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: Wed, 23 Mar 2016 13:44:49 -0000 Message-Id: In-Reply-To: <8c3dc662da1042fc8690befc467f168a@git.apache.org> References: <8c3dc662da1042fc8690befc467f168a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5 Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4509934f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4509934f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4509934f Branch: refs/heads/trunk Commit: 4509934f9e73a92ad9d79fbc10b753a73fd9cf98 Parents: 76241eb d479b8d Author: Marcus Eriksson Authored: Wed Mar 23 14:40:55 2016 +0100 Committer: Marcus Eriksson Committed: Wed Mar 23 14:40:55 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4509934f/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------