Updated Branches: refs/heads/cassandra-1.2 694e3a74a -> 7ff2805c7 refs/heads/trunk 5673ab3b6 -> 0411d5a2b
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/0411d5a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0411d5a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0411d5a2 Branch: refs/heads/trunk Commit: 0411d5a2b29c8dc2f2e202c6daa1cc38978537a9 Parents: 5673ab3 7ff2805 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Feb 14 11:27:32 2013 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Feb 14 11:27:32 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0411d5a2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ff0a9ba,aa25b63..6047e66 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,16 @@@ +1.3 + * 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) + + 1.2.2 * avoid no-op caching of byte[] on commitlog append (CASSANDRA-5199) - * more robust solution to incomplete compactions + counters (CASSANDRA-5151) * fix symlinks under data dir not working (CASSANDRA-5185) * fix bug in compact storage metadata handling (CASSANDRA-5189) * Validate login for USE queries (CASSANDRA-5207)
