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 AD29A17BE2 for ; Wed, 28 Jan 2015 16:34:10 +0000 (UTC) Received: (qmail 15044 invoked by uid 500); 28 Jan 2015 16:34:10 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 14955 invoked by uid 500); 28 Jan 2015 16:34:10 -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 14828 invoked by uid 99); 28 Jan 2015 16:34:10 -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, 28 Jan 2015 16:34:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2215E04BF; Wed, 28 Jan 2015 16:34:01 +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: Wed, 28 Jan 2015 16:34:03 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71abd220 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71abd220 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71abd220 Branch: refs/heads/trunk Commit: 71abd220811be55edbd725ed12b06626f596eb08 Parents: 8896a70 ffd0ae4 Author: Yuki Morishita Authored: Wed Jan 28 10:32:34 2015 -0600 Committer: Yuki Morishita Committed: Wed Jan 28 10:32:34 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/compaction/Upgrader.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71abd220/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71abd220/src/java/org/apache/cassandra/db/compaction/Upgrader.java ----------------------------------------------------------------------