Updated Branches: refs/heads/cassandra-1.2 8261aa083 -> 3a3f1d947 refs/heads/trunk 1a473094c -> 25a31be4f
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/25a31be4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25a31be4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25a31be4 Branch: refs/heads/trunk Commit: 25a31be4fe076ba36bd6a44cc3b3d2ba8134c7a9 Parents: 1a47309 3a3f1d9 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Mar 4 11:45:23 2013 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Mar 4 11:45:23 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/metrics/ConnectionMetrics.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25a31be4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 120f8a4,a6b2cff..9d7ed1d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ +1.3 + * 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) + + 1.2.3 + * replace ipv6 colons in jmx object names (CASSANDRA-5298) * 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)
