Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca32e053 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca32e053 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca32e053 Branch: refs/heads/trunk Commit: ca32e053681d804b50b9804fe0c4a92596a8f291 Parents: 3e53152 1cbd827 Author: Robert Stupp <sn...@snazy.de> Authored: Tue Dec 1 10:40:38 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Tue Dec 1 10:40:38 2015 +0100 ---------------------------------------------------------------------- bin/cqlsh.py | 11 ++++++++--- pylib/cqlshlib/helptopics.py | 25 ++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
