Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50e544f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50e544f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50e544f2 Branch: refs/heads/trunk Commit: 50e544f28239d8547dcdee575ec71efc9c8d2a26 Parents: 4589656 dceca93 Author: Mikhail Stepura <mish...@apache.org> Authored: Fri Feb 21 15:39:34 2014 -0800 Committer: Mikhail Stepura <mish...@apache.org> Committed: Fri Feb 21 15:39:34 2014 -0800 ---------------------------------------------------------------------- pylib/cqlshlib/cql3handling.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50e544f2/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------