Updated Branches: refs/heads/cassandra-1.2 068b53dd5 -> 3e8bffd00 refs/heads/trunk 755328b9c -> c12ca89eb
Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c12ca89e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c12ca89e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c12ca89e Branch: refs/heads/trunk Commit: c12ca89ebe62b9a86d455d77a46091d92eaa1558 Parents: 755328b 3e8bffd Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Feb 22 16:31:52 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Feb 22 16:31:52 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 12 ++++- .../cassandra/service/AntiEntropyService.java | 2 +- .../apache/cassandra/service/StorageService.java | 31 +++++++++++- .../cassandra/service/StorageServiceMBean.java | 5 ++ src/java/org/apache/cassandra/tools/NodeCmd.java | 9 +++- src/java/org/apache/cassandra/tools/NodeProbe.java | 38 +++++++++++++++ 6 files changed, 91 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c12ca89e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b843cfe,42a6e6d..5d2000d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,7 +1,20 @@@ +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 + Merged from 1.1: + ======= + * nodetool: ability to repair specific range (CASSANDRA-5280) 1.2.2 * fix potential for multiple concurrent compactions of the same sstables http://git-wip-us.apache.org/repos/asf/cassandra/blob/c12ca89e/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------