Updated Branches: refs/heads/cassandra-1.1 a12aa0815 -> 3e4858271 refs/heads/trunk 6ab4bd7a1 -> ee5c09a85
Merge branch 'cassandra-1.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/ee5c09a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee5c09a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee5c09a8 Branch: refs/heads/trunk Commit: ee5c09a857b646fff2dbfb1e592dbaf082d2cfea Parents: 6ab4bd7 3e48582 Author: Brandon Williams <[email protected]> Authored: Wed Jul 11 09:44:27 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Jul 11 09:44:27 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 13 ++++--------- pylib/cqlshlib/cql3handling.py | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
