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/918bc011 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/918bc011 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/918bc011 Branch: refs/heads/cassandra-3.1 Commit: 918bc0116db701976ad9d0847b3b5c6a051fbbd8 Parents: b5fb573 9a2fd8c Author: Robert Stupp <sn...@snazy.de> Authored: Fri Nov 27 15:26:08 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Nov 27 15:26:08 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 62 ++- build.xml | 7 +- conf/cqlshrc.sample | 17 + debian/rules | 3 +- pylib/cqlshlib/helptopics.py | 1078 ++++--------------------------------- 6 files changed, 188 insertions(+), 980 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/918bc011/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/918bc011/build.xml ----------------------------------------------------------------------
