natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1

This commit is contained in:
Benedict Elliott Smith 2014-08-01 21:51:01 +01:00
parent 24f6f038ef 3faf88cd07
commit 4f778d2e7e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -39,6 +39,7 @@ Merged from 2.0:
* (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)

10
src/java/org/apache/cassandra/config/CFMetaData.java
View File

@ -149,7 +149,7 @@ public final class CFMetaData
+ "durable_writes boolean,"
+ "strategy_class text,"
+ "strategy_options text"
+ ") WITH COMPACT STORAGE AND COMMENT='keyspace definitions' AND gc_grace_seconds=8640");
+ ") WITH COMPACT STORAGE AND COMMENT='keyspace definitions' AND gc_grace_seconds=604800");
public static final CFMetaData SchemaColumnFamiliesCf = compile("CREATE TABLE " + SystemKeyspace.SCHEMA_COLUMNFAMILIES_CF + " ("
+ "keyspace_name text,"
@ -182,7 +182,7 @@ public final class CFMetaData
+ "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,"
@ -195,7 +195,7 @@ public final class CFMetaData
+ "component_index int,"
+ "type text,"
+ "PRIMARY KEY(keyspace_name, columnfamily_name, column_name)"
+ ") WITH COMMENT='ColumnFamily column attributes' AND gc_grace_seconds=8640");
+ ") WITH COMMENT='ColumnFamily column attributes' AND gc_grace_seconds=604800");
public static final CFMetaData SchemaTriggersCf = compile("CREATE TABLE " + SystemKeyspace.SCHEMA_TRIGGERS_CF + " ("
+ "keyspace_name text,"
@ -203,7 +203,7 @@ public final class CFMetaData
+ "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,"
@ -211,7 +211,7 @@ public final class CFMetaData
+ "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,"