Updated Branches:
refs/heads/cassandra-1.2 f4a941e49 -> 7752f018b
refs/heads/trunk b7ba0a917 -> 34f08529e
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/34f08529
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34f08529
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34f08529
Branch: refs/heads/trunk
Commit: 34f08529ee17b6f5e5f6c740a7dc66a2e856254a
Parents: b7ba0a9 7752f01
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Jan 28 10:12:43 2013 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Jan 28 10:12:43 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/db/Directories.java | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/34f08529/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9876e37,3a4ebe7..5ae58fe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,14 @@@
+1.3
+ * 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)
+
+ 1.2.2
+ * fix symlinks under data dir not working (CASSANDRA-5185)
+
++
1.2.1
* stream undelivered hints on decommission (CASSANDRA-5128)
* GossipingPropertyFileSnitch loads saved dc/rack info if needed
(CASSANDRA-5133)
