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