Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b42a15b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b42a15b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b42a15b8 Branch: refs/heads/trunk Commit: b42a15b896334ec4a6a1c71a11a641d253d709b1 Parents: e6668be 1aea6d5 Author: Tyler Hobbs <[email protected]> Authored: Wed Aug 20 17:52:04 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Aug 20 17:52:04 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh | 16 +++++++++------- pylib/cqlshlib/cql3handling.py | 8 ++++---- 3 files changed, 15 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b42a15b8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b42a15b8/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------
