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 AD8AB1722F for ; Mon, 30 Mar 2015 22:02:34 +0000 (UTC) Received: (qmail 758 invoked by uid 500); 30 Mar 2015 22:02:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 659 invoked by uid 500); 30 Mar 2015 22:02:33 -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 321 invoked by uid 99); 30 Mar 2015 22:02:33 -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, 30 Mar 2015 22:02:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7100AE2EE7; Mon, 30 Mar 2015 22:02:33 +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: Mon, 30 Mar 2015 22:02:37 -0000 Message-Id: <631e7a77e40345a6ae33f2f42cd74e73@git.apache.org> In-Reply-To: <414ff438e23a4752804027ac3e61af07@git.apache.org> References: <414ff438e23a4752804027ac3e61af07@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/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/5abab57b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5abab57b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5abab57b Branch: refs/heads/cassandra-2.1 Commit: 5abab57b93817dfac939eb13eac812091d3655c6 Parents: 6ee4b09 0ff9c3c Author: Yuki Morishita Authored: Mon Mar 30 17:02:11 2015 -0500 Committer: Yuki Morishita Committed: Mon Mar 30 17:02:11 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5abab57b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bd5e277,539c4c8..00b632d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -87,6 -24,10 +87,7 @@@ Merged from 2.0 * Fix CQLSSTableWriter throwing exception and spawning threads (CASSANDRA-8808) * Fix MT mismatch between empty and GC-able data (CASSANDRA-8979) + * Fix incorrect validation when snapshotting single table (CASSANDRA-8056) - - -2.0.13: * Add offline tool to relevel sstables (CASSANDRA-8301) * Preserve stream ID for more protocol errors (CASSANDRA-8848) * Fix combining token() function with multi-column relations on http://git-wip-us.apache.org/repos/asf/cassandra/blob/5abab57b/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------