Updated Branches: refs/heads/cassandra-1.2 51d71a79b -> 6caddcd91 refs/heads/trunk 57f3adef3 -> 0f72806c3
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/0f72806c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f72806c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f72806c Branch: refs/heads/trunk Commit: 0f72806c3cbf77056d05b8e6827a9af9ff5389f4 Parents: 57f3ade 6caddcd Author: Jonathan Ellis <[email protected]> Authored: Mon Mar 11 09:17:26 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Mar 11 09:17:26 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../org/apache/cassandra/hadoop/ConfigHelper.java | 2 +- .../apache/cassandra/metrics/StreamingMetrics.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f72806c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b7da284,1279da7..3ea8849 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,6 +1,23 @@@ +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) + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328) * Avoid allocating SSTableBoundedScanner during repair when the range does not intersect the sstable (CASSANDRA-5249) * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
