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/5d110214 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d110214 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d110214 Branch: refs/heads/trunk Commit: 5d110214649f3967e7c1e0ef41e98ca54c2a6541 Parents: 32c8415 ee9807e Author: Jonathan Ellis <[email protected]> Authored: Mon Aug 24 20:10:19 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Aug 24 20:10:19 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/util.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d110214/CHANGES.txt ----------------------------------------------------------------------
