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/477a0a28
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/477a0a28
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/477a0a28
Branch: refs/heads/trunk
Commit: 477a0a28b5be1c8097c51fefaa77faed2f10e5b0
Parents: 22d86eb 167af2b
Author: Mikhail Stepura <mish...@apache.org>
Authored: Fri Apr 18 18:13:45 2014 -0700
Committer: Mikhail Stepura <mish...@apache.org>
Committed: Fri Apr 18 18:13:45 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 24 ++++++++++++++++++------
2 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/477a0a28/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6533ef4,0605f87..ca88dfd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -108,7 -65,6 +108,8 @@@ 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)
2.0.6
http://git-wip-us.apache.org/repos/asf/cassandra/blob/477a0a28/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
