Updated Branches: refs/heads/trunk c1724dd8a -> 2edeeeba2
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/2edeeeba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2edeeeba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2edeeeba Branch: refs/heads/trunk Commit: 2edeeeba2db06e0fc5bd70c60471ab1f87d2ffc7 Parents: c1724dd 83b6f22 Author: Brandon Williams <[email protected]> Authored: Wed Sep 26 10:08:32 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Sep 26 10:08:32 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 2 +- pylib/cqlshlib/cql3handling.py | 5 ++++- pylib/cqlshlib/cqlhandling.py | 9 +++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2edeeeba/bin/cqlsh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2edeeeba/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2edeeeba/pylib/cqlshlib/cqlhandling.py ----------------------------------------------------------------------
