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/dfc1a445 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfc1a445 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfc1a445 Branch: refs/heads/cassandra-3.0 Commit: dfc1a445081315e394c55e39e0ac55875acb2b2d Parents: 10e4781 ce7159e Author: Tyler Hobbs <[email protected]> Authored: Fri Aug 7 15:50:07 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Aug 7 15:50:07 2015 -0500 ---------------------------------------------------------------------- NEWS.txt | 24 ++++++++++++++++++++++++ pylib/cqlshlib/formatting.py | 28 ++++------------------------ pylib/cqlshlib/util.py | 15 +++++++++++++++ 3 files changed, 43 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfc1a445/NEWS.txt ----------------------------------------------------------------------
