Updated Branches: refs/heads/cassandra-1.2 ec21288db -> 1fac06a84 refs/heads/trunk b153d4564 -> 351bc03c6
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/351bc03c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/351bc03c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/351bc03c Branch: refs/heads/trunk Commit: 351bc03c69f77def281572c2b0e6d326574f433e Parents: b153d45 1fac06a Author: Jonathan Ellis <[email protected]> Authored: Mon Jan 14 15:35:00 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jan 14 15:35:00 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Table.java | 26 ++++++++---- .../apache/cassandra/service/StorageService.java | 31 +++++++++++--- 3 files changed, 43 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/351bc03c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 93d7ecd,2e8d2c9..325578a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ +1.3 + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_tim_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + 1.2.1 + * drain should flush system CFs too (CASSANDRA-4446) * add inter_dc_tcp_nodelay setting (CASSANDRA-5148) * re-allow wrapping ranges for start_token/end_token range pairing (CASSANDRA-5106) * fix validation compaction of empty rows (CASSADRA-5136) http://git-wip-us.apache.org/repos/asf/cassandra/blob/351bc03c/src/java/org/apache/cassandra/db/Table.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/351bc03c/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
