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/20693928 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20693928 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20693928 Branch: refs/heads/trunk Commit: 20693928ae848676e1f859ecf4a473c9818707c9 Parents: 35cbc19 c4c8bca Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Oct 22 03:15:22 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Oct 22 03:15:22 2013 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 68 +------------------------------------ 2 files changed, 2 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/20693928/CHANGES.txt ----------------------------------------------------------------------