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/11bddad5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11bddad5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11bddad5 Branch: refs/heads/cassandra-3.0 Commit: 11bddad51f1d313bf2161a535bae68ec97ff34ca Parents: 0663ebb 6622970 Author: Tyler Hobbs <[email protected]> Authored: Fri Feb 5 16:34:47 2016 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Fri Feb 5 16:34:47 2016 -0600 ---------------------------------------------------------------------- conf/cqlshrc.sample | 199 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 172 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
