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/5b8a6b63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b8a6b63
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b8a6b63

Branch: refs/heads/trunk
Commit: 5b8a6b63d9376ac47c0bcec40e52ad05560594bc
Parents: dc84af4 992a27e
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Tue Jul 22 14:09:53 2014 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Tue Jul 22 14:09:53 2014 -0500

----------------------------------------------------------------------
 pylib/cqlshlib/cql3handling.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


Reply via email to