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/306d882f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/306d882f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/306d882f Branch: refs/heads/trunk Commit: 306d882fe3d997a5ddc2b21ed60ca24c5e71c7bc Parents: 33e7bba 918bc01 Author: Robert Stupp <sn...@snazy.de> Authored: Fri Nov 27 15:26:13 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Nov 27 15:26:13 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/306d882f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/306d882f/build.xml ----------------------------------------------------------------------
