Updated Branches:
refs/heads/trunk 2e63d096c -> 3254dbaeb
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/3254dbae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3254dbae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3254dbae
Branch: refs/heads/trunk
Commit: 3254dbaebda91e1080dfcd5c0949a3270c665a64
Parents: 2e63d09 28be383
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Mon Mar 18 09:28:53 2013 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Mon Mar 18 09:28:53 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
.../org/apache/cassandra/cql3/QueryProcessor.java | 11 +++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3254dbae/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 13abbd9,b3fbf9b..feb6d4a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,6 +1,25 @@@
+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)
+ * Remove memory emergency pressure valve logic (CASSANDRA-3534)
+
+
+ 1.2.4
+ * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
+
++
1.2.3
* add check for sstable overlap within a level on startup (CASSANDRA-5327)
* replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3254dbae/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
