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 1EF1711C4F for ; Mon, 25 Aug 2014 13:57:55 +0000 (UTC) Received: (qmail 71290 invoked by uid 500); 25 Aug 2014 13:57:54 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 71253 invoked by uid 500); 25 Aug 2014 13:57:54 -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 71233 invoked by uid 99); 25 Aug 2014 13:57:54 -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, 25 Aug 2014 13:57:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6B5949CD079; Mon, 25 Aug 2014 13:57:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Mon, 25 Aug 2014 13:57:55 -0000 Message-Id: <94bc370f327a4644b252e715f377a783@git.apache.org> In-Reply-To: <2603560ec8e9421db9dc0d7282f8683b@git.apache.org> References: <2603560ec8e9421db9dc0d7282f8683b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0 Merge branch 'cassandra-2.0' into cassandra-2.1.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/63c21a32 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63c21a32 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63c21a32 Branch: refs/heads/cassandra-2.1.0 Commit: 63c21a32ddb69b5d797a6256d292329b708e4194 Parents: baae9b6 5d4740c Author: Sylvain Lebresne Authored: Mon Aug 25 15:57:43 2014 +0200 Committer: Sylvain Lebresne Committed: Mon Aug 25 15:57:43 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ .../apache/cassandra/service/StorageProxy.java | 24 +++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63c21a32/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d7c3dea,4d5d851..15e41da --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,10 +1,15 @@@ -2.0.11: +2.1.0 + * Correctly remove tmplink files (CASSANDRA-7803) + * (cqlsh) Fix column name formatting for functions, CAS operations, + and UDT field selections (CASSANDRA-7806) + * (cqlsh) Fix COPY FROM handling of null/empty primary key + values (CASSANDRA-7792) + * Fix ordering of static cells (CASSANDRA-7763) +Merged from 2.0: + * Always send Paxos commit to all replicas (CASSANDRA-7479) - -2.0.10 + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753) * Fix ALTER clustering column type from DateType to TimestampType when using DESC clustering order (CASSANRDA-7797) http://git-wip-us.apache.org/repos/asf/cassandra/blob/63c21a32/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------