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/9957ed66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9957ed66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9957ed66 Branch: refs/heads/trunk Commit: 9957ed667505fc4be39007714b3be646b42b9549 Parents: 66957ec 20f1b81 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Oct 21 23:15:27 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Oct 21 23:15:27 2013 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 2 +- pylib/cqlshlib/cql3handling.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9957ed66/CHANGES.txt ----------------------------------------------------------------------
