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/a8e00295 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8e00295 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8e00295 Branch: refs/heads/trunk Commit: a8e00295923f5d72cee6783b1e06cecbba8ba0a6 Parents: 85098de 10e4781 Author: Tyler Hobbs <[email protected]> Authored: Fri Aug 7 15:35:36 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Aug 7 15:35:36 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh.py | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
