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 A26791026C for ; Wed, 21 Aug 2013 20:36:44 +0000 (UTC) Received: (qmail 49192 invoked by uid 500); 21 Aug 2013 20:36:43 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49122 invoked by uid 500); 21 Aug 2013 20:36:42 -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 48730 invoked by uid 99); 21 Aug 2013 20:36:42 -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, 21 Aug 2013 20:36:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 539738C1F47; Wed, 21 Aug 2013 20:36:42 +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, 21 Aug 2013 20:36:48 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0 Merge branch 'cassandra-1.2' into cassandra-2.0.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d3eef82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d3eef82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d3eef82 Branch: refs/heads/trunk Commit: 7d3eef8233beb27642bdb8edd43eb9bf3eef5992 Parents: 9dc4c16 ad8f88e Author: Yuki Morishita Authored: Wed Aug 21 15:35:05 2013 -0500 Committer: Yuki Morishita Committed: Wed Aug 21 15:35:05 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../apache/cassandra/db/compaction/LeveledManifest.java | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d3eef82/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fdee261,e1c963c..7af02da --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -47,7 -16,16 +47,10 @@@ Merged from 1.2 * Future-proof inter-major-version schema migrations (CASSANDRA-5845) * (Hadoop) add CqlPagingRecordReader support for ReversedType in Thrift table (CASSANDRA-5718) - * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868) - * cqlsh: add support for multiline comments (CASSANDRA-5798) - * Handle CQL3 SELECT duplicate IN restrictions on clustering columns - (CASSANDRA-5856) - * Don't announce schema version until we've loaded the changes locally - (CASSANDRA-5904) * Add -no-snapshot option to scrub (CASSANDRA-5891) + * Fix to support off heap bloom filters size greater than 2 GB (CASSANDRA-5903) + * Properly handle parsing huge map and set literals (CASSANDRA-5893) + * Fix LCS L0 compaction may overlap in L1 (CASSANDRA-5907) Merged from 1.1: * Correctly validate sparse composite cells in scrub (CASSANDRA-5855) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d3eef82/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------