Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc42f326 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc42f326 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc42f326 Branch: refs/heads/trunk Commit: bc42f3264f3486202873e88b73f268535fed130c Parents: 8e3a47d 4b364ec Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Nov 20 15:13:01 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Nov 20 15:13:01 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 28 ++++++++++++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc42f326/CHANGES.txt ----------------------------------------------------------------------