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/a09e53cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a09e53cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a09e53cd Branch: refs/heads/cassandra-2.1.0 Commit: a09e53cdadb0be17ef4c27e194a387c239a532a2 Parents: a2c91d7 63a1e98 Author: Tyler Hobbs <ty...@datastax.com> Authored: Fri Aug 1 15:46:59 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Fri Aug 1 15:46:59 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a09e53cd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a8299c6,68d40b0..6ab8a73 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,53 -1,11 +1,54 @@@ -2.0.10 - * Fix truncate to always flush (CASSANDRA-7511) +2.1.0-final + * Don't use strict consistency when replacing (CASSANDRA-7568) + * Fix min/max cell name collection on 2.0 SSTables with range + tombstones (CASSANDRA-7593) + * Tolerate min/max cell names of different lengths (CASSANDRA-7651) + * Filter cached results correctly (CASSANDRA-7636) + * Fix tracing on the new SEPExecutor (CASSANDRA-7644) * Remove shuffle and taketoken (CASSANDRA-7601) - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467) - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) - * Always merge ranges owned by a single node (CASSANDRA-6930) - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Clean up Windows batch scripts (CASSANDRA-7619) + * Fix native protocol drop user type notification (CASSANDRA-7571) + * Give read access to system.schema_usertypes to all authenticated users + (CASSANDRA-7578) + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580) + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572) + * Fix NPE when dropping index from non-existent keyspace, AssertionError when + dropping non-existent index with IF EXISTS (CASSANDRA-7590) + * Fix sstablelevelresetter hang (CASSANDRA-7614) + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603) + * Use "keyspace updated" schema change message for UDT changes in v1 and + v2 protocols (CASSANDRA-7617) + * Fix tracing of range slices and secondary index lookups that are local + to the coordinator (CASSANDRA-7599) + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587) + * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596) + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625) + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626) + * Fix tracing of concurrent range slices and 2ary index queries (CASSANDRA-7626) +Merged from 2.0: ++ * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668) + * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663) + * Always flush on truncate (CASSANDRA-7511) * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) + * Always merge ranges owned by a single node (CASSANDRA-6930) + * Track max/min timestamps for range tombstones (CASSANDRA-7647) + * Fix NPE when listing saved caches dir (CASSANDRA-7632) + + +2.1.0-rc4 + * Fix word count hadoop example (CASSANDRA-7200) + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults + (CASSANDRA-7551) + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505) + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521) + * Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539) + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527) + * Fix configuration error message when running nodetool ring (CASSANDRA-7508) + * Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509) + * Handle queries on multiple secondary index types (CASSANDRA-7525) + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564) + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) +Merged from 2.0: * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541) * Fix range merging when DES scores are zero (CASSANDRA-7535) * Warn when SSL certificates have expired (CASSANDRA-7528) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a09e53cd/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/CFMetaData.java index 84804b0,650d6c4..83c1267 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@@ -177,12 -136,11 +177,12 @@@ public final class CFMetaDat + "column_aliases text," + "compaction_strategy_options text," + "speculative_retry text," - + "populate_io_cache_on_flush boolean," + "index_interval int," + + "min_index_interval int," + + "max_index_interval int," + "dropped_columns map<text, bigint>," + "PRIMARY KEY (keyspace_name, columnfamily_name)" - + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=8640"); + + ") WITH COMMENT='ColumnFamily definitions' AND gc_grace_seconds=604800"); public static final CFMetaData SchemaColumnsCf = compile("CREATE TABLE " + SystemKeyspace.SCHEMA_COLUMNS_CF + " (" + "keyspace_name text," @@@ -203,16 -161,8 +203,16 @@@ + "trigger_name text," + "trigger_options map<text, text>," + "PRIMARY KEY (keyspace_name, columnfamily_name, trigger_name)" - + ") WITH COMMENT='triggers metadata table'"); + + ") WITH COMMENT='triggers metadata table' AND gc_grace_seconds=604800"); + public static final CFMetaData SchemaUserTypesCf = compile("CREATE TABLE " + SystemKeyspace.SCHEMA_USER_TYPES_CF + " (" + + "keyspace_name text," + + "type_name text," + + "field_names list<text>," + + "field_types list<text>," + + "PRIMARY KEY (keyspace_name, type_name)" - + ") WITH COMMENT='Defined user types' AND gc_grace_seconds=8640"); ++ + ") WITH COMMENT='Defined user types' AND gc_grace_seconds=604800"); + public static final CFMetaData HintsCf = compile("CREATE TABLE " + SystemKeyspace.HINTS_CF + " (" + "target_id uuid," + "hint_id timeuuid,"