You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/02/05 23:35:27 UTC

[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93f77c74
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93f77c74
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93f77c74

Branch: refs/heads/trunk
Commit: 93f77c74da30dad871e2744c392cc7bed407e1ae
Parents: cbb2be1 11bddad
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Feb 5 16:35:13 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Feb 5 16:35:13 2016 -0600

----------------------------------------------------------------------
 conf/cqlshrc.sample | 199 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 172 insertions(+), 27 deletions(-)
----------------------------------------------------------------------