Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2309227 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2309227 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2309227 Branch: refs/heads/cassandra-2.1 Commit: d2309227c2050f81a9eee43292f01356ad296fb0 Parents: a29ee07 ef14f51 Author: Tyler Hobbs <ty...@datastax.com> Authored: Fri Oct 31 14:16:45 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Fri Oct 31 14:16:45 2014 -0500 ---------------------------------------------------------------------- pylib/cqlshlib/helptopics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2309227/pylib/cqlshlib/helptopics.py ----------------------------------------------------------------------
