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/f90a6119 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f90a6119 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f90a6119 Branch: refs/heads/trunk Commit: f90a61191ea309ba2532e53786cdf33e7075d017 Parents: 90a9558 65ee15f Author: Tyler Hobbs <[email protected]> Authored: Tue Aug 25 10:03:41 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Tue Aug 25 10:03:41 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 +++- pylib/cqlshlib/cql3handling.py | 41 ++++++++++--------------------------- pylib/cqlshlib/cqlhandling.py | 12 ++--------- 3 files changed, 16 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f90a6119/CHANGES.txt ----------------------------------------------------------------------
