Merge branch 'cassandra-3.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/c42fcf57 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c42fcf57 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c42fcf57 Branch: refs/heads/trunk Commit: c42fcf570904964298c2c0ec9fffab6aa0cc90db Parents: 2a4b8f1 9940892 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Nov 5 14:35:34 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Nov 5 14:35:34 2015 +0000 ---------------------------------------------------------------------- bin/cqlsh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------