Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d856d3d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d856d3d7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d856d3d7 Branch: refs/heads/cassandra-3.0 Commit: d856d3d7bb4ab2a7534158a23e6a2132ef9bb246 Parents: f901a74 40cef77 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Tue Oct 27 09:12:22 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Tue Oct 27 09:12:22 2015 -0500 ---------------------------------------------------------------------- bin/cqlsh.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d856d3d7/bin/cqlsh.py ----------------------------------------------------------------------
