Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3429658 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3429658 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3429658 Branch: refs/heads/trunk Commit: c342965810302bf13ed4bbb2f2301c6358dfb4a4 Parents: 105dcdb fab5509 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Mar 13 13:06:28 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Mar 13 13:06:28 2014 -0500 ---------------------------------------------------------------------- pylib/cqlshlib/cql3handling.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
