Updated Branches: refs/heads/cassandra-1.1 c5ad288c9 -> f1ee34f08 refs/heads/trunk cb25a8fcd -> 85a42a59d
Merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85a42a59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85a42a59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85a42a59 Branch: refs/heads/trunk Commit: 85a42a59d48447a6b56b95b5bab675c3fd33c626 Parents: cb25a8f f1ee34f Author: Brandon Williams <[email protected]> Authored: Tue May 1 09:52:29 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 1 09:52:29 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 120 +++++++++++++++++++--------------- pylib/cqlshlib/cql3handling.py | 13 ++++- 2 files changed, 79 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
