Updated Branches: refs/heads/trunk a24b2712d -> 57f3adef3
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57f3adef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57f3adef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57f3adef Branch: refs/heads/trunk Commit: 57f3adef3a389c767b9fcb49564a7165f0c554ea Parents: a24b271 61465c3 Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 8 17:44:07 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 8 17:44:07 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/57f3adef/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ae43b77,9296c6a..b7da284 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ +2.0 + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * 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, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace from user-defined compaction API (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable level (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + + 1.2.3 + * add check for sstable overlap within a level on startup (CASSANDRA-5327) * replace ipv6 colons in jmx object names (CASSANDRA-5298) * Avoid allocating SSTableBoundedScanner during repair when the range does not intersect the sstable (CASSANDRA-5249)
