Merge branch 'cassandra-2.0' into cassandra-2.1
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/cde78097
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cde78097
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cde78097
Branch: refs/heads/trunk
Commit: cde78097d16f85b0d45bc3b97904962353ef3198
Parents: 477a0a2 4596a07
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Mon Apr 21 09:47:01 2014 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Mon Apr 21 09:47:01 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde78097/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ca88dfd,972f65a..b0e8e0d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -108,8 -65,7 +108,9 @@@ Merged from 1.2
* Schedule schema pulls on change (CASSANDRA-6971)
* Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
* Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
+ * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
+ * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
+ * Properly load trustore in the native protocol (CASSANDRA-6847)
2.0.6
