Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13ecf33d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13ecf33d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13ecf33d Branch: refs/heads/trunk Commit: 13ecf33d9d31f9f906b12a3c7febcf9910be2e10 Parents: 96bbb67 24a1a5d Author: Tyler Hobbs <[email protected]> Authored: Thu Jun 4 11:40:22 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Thu Jun 4 11:40:22 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cqlhandling.py | 18 +++++++++++++++++- pylib/cqlshlib/pylexotron.py | 12 +++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13ecf33d/CHANGES.txt ----------------------------------------------------------------------
