cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [07/11] git commit: merge from 2.0
Date Sat, 12 Jul 2014 04:51:31 GMT
merge from 2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83ac8a63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83ac8a63
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83ac8a63

Branch: refs/heads/cassandra-2.1
Commit: 83ac8a631ed46bde023779d4ddb0fa0624f64965
Parents: 380583b a454461
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Jul 11 23:50:46 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Jul 11 23:50:46 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                   | 1 +
 examples/hadoop_cql3_word_count/bin/word_count                | 0
 examples/hadoop_cql3_word_count/bin/word_count_counters       | 0
 examples/hadoop_cql3_word_count/bin/word_count_setup          | 0
 .../org/apache/cassandra/locator/DynamicEndpointSnitch.java   | 7 ++++++-
 5 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/83ac8a63/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c0fd4c0,e1c8922..d3390f9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,6 +1,32 @@@
 -2.0.10
 +2.1.0-final
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 +Merged from 2.0:
+  * Fix range merging when DES scores are zero (CASSANDRA-7535)
   * Warn when SSL certificates have expired (CASSANDRA-7528)
 + * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 +Merged from 1.2:
 + * Set correct stream ID on responses when non-Exception Throwables
 +   are thrown while handling native protocol messages (CASSANDRA-7470)
 +
 +
 +2.1.0-rc3
 + * Consider expiry when reconciling otherwise equal cells (CASSANDRA-7403)
 + * Introduce CQL support for stress tool (CASSANDRA-6146)
 + * Fix ClassCastException processing expired messages (CASSANDRA-7496)
 + * Fix prepared marker for collections inside UDT (CASSANDRA-7472)
 + * Remove left-over populate_io_cache_on_flush and replicate_on_write
 +   uses (CASSANDRA-7493)
 + * (Windows) handle spaces in path names (CASSANDRA-7451)
 + * Ensure writes have completed after dropping a table, before recycling
 +   commit log segments (CASSANDRA-7437)
 + * Remove left-over rows_per_partition_to_cache (CASSANDRA-7493)
 + * Fix error when CONTAINS is used with a bind marker (CASSANDRA-7502)
 + * Properly reject unknown UDT field (CASSANDRA-7484)
 +Merged from 2.0:
 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 + * Support DISTINCT for static columns and fix behaviour when DISTINC is
 +   not use (CASSANDRA-7305).
   * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
   * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
   * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM


Mime
View raw message