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 28F5017BA0 for ; Wed, 3 Jun 2015 12:10:17 +0000 (UTC) Received: (qmail 16309 invoked by uid 500); 3 Jun 2015 12:10:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 16261 invoked by uid 500); 3 Jun 2015 12:10:16 -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 16049 invoked by uid 99); 3 Jun 2015 12:10:16 -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, 03 Jun 2015 12:10:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7C431E0AA0; Wed, 3 Jun 2015 12:10:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Wed, 03 Jun 2015 12:10:19 -0000 Message-Id: <2bdf91496e1d4d3eac9eb253462c27a5@git.apache.org> In-Reply-To: <62fd211e07a544fa99e740e5b781023c@git.apache.org> References: <62fd211e07a544fa99e740e5b781023c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/9] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 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/c1c78559 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1c78559 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1c78559 Branch: refs/heads/trunk Commit: c1c785593c72b6b853961f31dab9e2636d2876a2 Parents: 08a5dab 6250065 Author: Benedict Elliott Smith Authored: Wed Jun 3 13:03:59 2015 +0100 Committer: Benedict Elliott Smith Committed: Wed Jun 3 13:03:59 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 32 +++++++++++--------- 2 files changed, 19 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1c78559/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8124256,9ce5680..6f2c0ee --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,5 +1,20 @@@ -2.1.6 +2.2 + * Clean up gossiper logic for old versions (CASSANDRA-9370) + * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515) + * ant test-all results incomplete when parsed (CASSANDRA-9463) + * Disallow frozen<> types in function arguments and return types for + clarity (CASSANDRA-9411) + * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431) + * Update commitlog archiving examples now that commitlog segments are + not recycled (CASSANDRA-9350) + * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568) + * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399) + * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409) + * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429) + * Add ability to stop compaction by ID (CASSANDRA-7207) + * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438) +Merged from 2.1: + * Ensure truncate without snapshot cannot produce corrupt responses (CASSANDRA-9388) * Consistent error message when a table mixes counter and non-counter columns (CASSANDRA-9492) * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1c78559/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------