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/8902074a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8902074a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8902074a Branch: refs/heads/trunk Commit: 8902074a02a692a094e7b23a50a77bf421bd691d Parents: a8e0029 dfc1a44 Author: Tyler Hobbs <[email protected]> Authored: Fri Aug 7 15:51:09 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Aug 7 15:51:09 2015 -0500 ---------------------------------------------------------------------- NEWS.txt | 24 ++++++++++++++++++++++++ pylib/cqlshlib/formatting.py | 28 ++++------------------------ pylib/cqlshlib/util.py | 15 +++++++++++++++ 3 files changed, 43 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
