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/c1b1aec1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1b1aec1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1b1aec1 Branch: refs/heads/trunk Commit: c1b1aec19ca8a2038a5878334efe40a092ed1be0 Parents: af089f6 9b3b3ca Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Nov 25 11:57:49 2015 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed Nov 25 11:57:49 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1b1aec1/CHANGES.txt ----------------------------------------------------------------------
