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 7974810505 for ; Wed, 30 Oct 2013 15:22:38 +0000 (UTC) Received: (qmail 62829 invoked by uid 500); 30 Oct 2013 15:18:51 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 62718 invoked by uid 500); 30 Oct 2013 15:18:43 -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 62432 invoked by uid 99); 30 Oct 2013 15:18:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Oct 2013 15:18:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A8E9C890A2B; Wed, 30 Oct 2013 15:18:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Wed, 30 Oct 2013 15:18:38 -0000 Message-Id: In-Reply-To: <70cb52b89ea6494387743a2894386d12@git.apache.org> References: <70cb52b89ea6494387743a2894386d12@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] git commit: merge from 2.0 merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d39ec221 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d39ec221 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d39ec221 Branch: refs/heads/trunk Commit: d39ec221be61b59805eb27d5e767f1958678ac3f Parents: f1d5b5d Author: Jonathan Ellis Authored: Wed Oct 30 10:18:23 2013 -0500 Committer: Jonathan Ellis Committed: Wed Oct 30 10:18:23 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d39ec221/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8cdbbe1..5a2e56b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,7 @@ 2.0.3 + * Fixes for compacting larger-than-memory rows (CASSANDRA-6274) * Compact hottest sstables first and optionally omit coldest from compaction entirely (CASSANDRA-6109) * Fix modifying column_metadata from thrift (CASSANDRA-6182)