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/a5fbb320 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5fbb320 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5fbb320 Branch: refs/heads/trunk Commit: a5fbb3205831eddd68c2fdc65ecac84fb5385cc2 Parents: 35e912f 239927d Author: Tyler Hobbs <[email protected]> Authored: Fri Jun 26 13:43:43 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Jun 26 13:43:43 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 1 + pylib/cqlshlib/test/basecase.py | 1 + pylib/cqlshlib/test/cassconnect.py | 4 ++-- pylib/cqlshlib/test/test_cqlsh_completion.py | 6 ++++++ 5 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5fbb320/CHANGES.txt ----------------------------------------------------------------------
