Updated Branches: refs/heads/cassandra-1.1 7f6cc5ef6 -> 9f32efa72 refs/heads/trunk 1cb0ad5c4 -> 3c92afdd8
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/3c92afdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c92afdd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c92afdd Branch: refs/heads/trunk Commit: 3c92afdd8a6d75a23e66cb9d26f616b544112e50 Parents: 1cb0ad5 9f32efa Author: Brandon Williams <[email protected]> Authored: Sat Jul 14 16:22:14 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Sat Jul 14 16:22:14 2012 -0500 ---------------------------------------------------------------------- pylib/cqlshlib/cql3handling.py | 28 ++++++++++++++++++---------- pylib/cqlshlib/cqlhandling.py | 6 +++++- 2 files changed, 23 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
