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 BC7371115D for ; Fri, 25 Apr 2014 22:01:28 +0000 (UTC) Received: (qmail 99960 invoked by uid 500); 25 Apr 2014 22:01:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 99893 invoked by uid 500); 25 Apr 2014 22:01:24 -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 99807 invoked by uid 99); 25 Apr 2014 22:01:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Apr 2014 22:01:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1D0139526CF; Fri, 25 Apr 2014 22:01:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Fri, 25 Apr 2014 22:01:26 -0000 Message-Id: <058ae77c94634df8b016010f0c7f312d@git.apache.org> In-Reply-To: <8465a6d1a1024ba78c2a0b6b297ab4b3@git.apache.org> References: <8465a6d1a1024ba78c2a0b6b297ab4b3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.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/e974b6f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e974b6f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e974b6f9 Branch: refs/heads/cassandra-2.1 Commit: e974b6f9359bf66225155b1547e99c5ca8492321 Parents: 98dcde1 63ba588 Author: Brandon Williams Authored: Fri Apr 25 16:51:35 2014 -0500 Committer: Brandon Williams Committed: Fri Apr 25 16:51:35 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 8 ++++++++ src/java/org/apache/cassandra/tools/NodeCmd.java | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e974b6f9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 73c5034,aad3721..cd6443e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,12 +1,21 @@@ -1.2.17 +2.0.8 + * Set JMX RMI port to 7199 (CASSANDRA-7087) + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) + * Log a warning for large batches (CASSANDRA-6487) + * Queries on compact tables can return more rows that requested (CASSANDRA-7052) + * USING TIMESTAMP for batches does not work (CASSANDRA-7053) + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) +Merged from 1.2: + * Fix nodetool display with vnodes (CASSANDRA-7082) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps + (CASSANDRA-6822) + * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787) + * Schedule schema pulls on change (CASSANDRA-6971) + * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980) + * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025) * Fix batchlog to account for CF truncation records (CASSANDRA-6999) * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e974b6f9/src/java/org/apache/cassandra/tools/NodeCmd.java ----------------------------------------------------------------------