You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/04/26 00:01:27 UTC
[5/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.0
Commit: e974b6f9359bf66225155b1547e99c5ca8492321
Parents: 98dcde1 63ba588
Author: Brandon Williams <br...@apache.org>
Authored: Fri Apr 25 16:51:35 2014 -0500
Committer: Brandon Williams <br...@apache.org>
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
----------------------------------------------------------------------