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/9eb01aeb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9eb01aeb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9eb01aeb Branch: refs/heads/trunk Commit: 9eb01aebd603243a7319b0025b23ed44a91925eb Parents: 87318ef e2a719a Author: Mikhail Stepura <[email protected]> Authored: Tue Mar 4 11:51:53 2014 -0800 Committer: Mikhail Stepura <[email protected]> Committed: Tue Mar 4 11:51:53 2014 -0800 ---------------------------------------------------------------------- bin/cqlsh | 5 ++++- pylib/cqlshlib/cql3handling.py | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
