Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5942afa8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5942afa8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5942afa8 Branch: refs/heads/trunk Commit: 5942afa89e0a78cec673f6ed2cf2e52bd0dcc66a Parents: 9bf5b45 1240c9b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Oct 23 14:30:22 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Oct 23 14:30:22 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/SystemKeyspace.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5942afa8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5bb11b7,1df6ade..88531ad --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,6 +1,15 @@@ +2.1 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + + 2.0.3 * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) + * Fix NPE while loading paxos state (CASSANDRA-6211) Merged from 1.2: * Fix altering column types (CASSANDRA-6185) * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5942afa8/src/java/org/apache/cassandra/db/SystemKeyspace.java ----------------------------------------------------------------------
