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/13daf89d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13daf89d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13daf89d Branch: refs/heads/cassandra-3.0 Commit: 13daf89dafa254c640c04cf5ef38946efa349651 Parents: 0858bfb af509ec Author: Robert Stupp <sn...@snazy.de> Authored: Sun Dec 27 17:28:15 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Sun Dec 27 17:28:15 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13daf89d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13daf89d/bin/cqlsh.py ----------------------------------------------------------------------