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

Branch: refs/heads/trunk
Commit: febd6e159d8c02e06f4f4025297b9dbd04ee71ec
Parents: a896d0f 0508a15
Author: Mikhail Stepura <mish...@apache.org>
Authored: Fri Feb 21 15:40:30 2014 -0800
Committer: Mikhail Stepura <mish...@apache.org>
Committed: Fri Feb 21 15:40:30 2014 -0800

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


Reply via email to