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/097ce387 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/097ce387 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/097ce387 Branch: refs/heads/trunk Commit: 097ce3873f2a1e6474ecca4b11eda9ae5d2b274d Parents: 0d8e853 fcc40e5 Author: Robert Stupp <sn...@snazy.de> Authored: Wed Feb 17 13:43:00 2016 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Wed Feb 17 13:43:00 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 4 ++-- pylib/cqlshlib/cqlhandling.py | 3 ++- pylib/cqlshlib/test/cassconnect.py | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/097ce387/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/097ce387/bin/cqlsh.py ----------------------------------------------------------------------
