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 12A6A18FAB for ; Fri, 22 Jan 2016 17:45:22 +0000 (UTC) Received: (qmail 79430 invoked by uid 500); 22 Jan 2016 17:45:20 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 79385 invoked by uid 500); 22 Jan 2016 17:45:20 -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 79105 invoked by uid 99); 22 Jan 2016 17:45:20 -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; Fri, 22 Jan 2016 17:45:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7B456E0098; Fri, 22 Jan 2016 17:45:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Fri, 22 Jan 2016 17:45:29 -0000 Message-Id: <3ffe75f132704592b267d6682bb00961@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b05203f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b05203f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b05203f Branch: refs/heads/trunk Commit: 0b05203feaab296c6530469fdd128c24cc2c6a97 Parents: d2b7051 3b244a3 Author: Yuki Morishita Authored: Fri Jan 22 11:43:35 2016 -0600 Committer: Yuki Morishita Committed: Fri Jan 22 11:43:35 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b05203f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b05203f/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------