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/bee7917b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bee7917b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bee7917b Branch: refs/heads/trunk Commit: bee7917b4dcca9779ff7b2ee9b97a7c4299ceacd Parents: a60a80b 3aaae7a Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jan 22 16:03:52 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jan 22 16:03:52 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bee7917b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bee7917b/bin/cqlsh.py ----------------------------------------------------------------------
