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/bcd921c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd921c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcd921c3 Branch: refs/heads/trunk Commit: bcd921c3c8aba7a5d878d6c3e65f502f49aa5d11 Parents: e5c4e5e ebb2b1b Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Oct 14 11:21:48 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed Oct 14 11:21:48 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/formatting.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd921c3/CHANGES.txt ----------------------------------------------------------------------