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 01E7410917 for ; Mon, 26 Aug 2013 23:02:02 +0000 (UTC) Received: (qmail 38776 invoked by uid 500); 26 Aug 2013 23:01:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 38719 invoked by uid 500); 26 Aug 2013 23:01:59 -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 38523 invoked by uid 99); 26 Aug 2013 23:01:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Aug 2013 23:01:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B5BEB1E068; Mon, 26 Aug 2013 23:01:58 +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: Mon, 26 Aug 2013 23:02:12 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [15/15] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/300f1a65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/300f1a65 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/300f1a65 Branch: refs/heads/trunk Commit: 300f1a65ceca3286fa8d530658cbcae59310cc12 Parents: b2930de 37c7d23 Author: Jonathan Ellis Authored: Mon Aug 26 18:01:49 2013 -0500 Committer: Jonathan Ellis Committed: Mon Aug 26 18:01:49 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ NEWS.txt | 9 +++++++++ .../org/apache/cassandra/config/Config.java | 2 ++ .../cassandra/config/DatabaseDescriptor.java | 20 ++++++++++++++++++++ .../cql3/statements/AlterTableStatement.java | 15 +++++++++++++++ src/java/org/apache/cassandra/db/Memtable.java | 17 ++++++++--------- .../db/compaction/CompactionManager.java | 12 +++++------- .../org/apache/cassandra/utils/Allocator.java | 4 ++++ .../apache/cassandra/utils/HeapAllocator.java | 16 +++++++++++++++- 9 files changed, 82 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/300f1a65/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/300f1a65/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/300f1a65/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/300f1a65/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------