Updated Branches: refs/heads/cassandra-1.1 1e6cc9aeb -> 5a63858d0 refs/heads/trunk 5bb13b426 -> a946e61d1
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/a946e61d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a946e61d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a946e61d Branch: refs/heads/trunk Commit: a946e61d171e8033d4e193f50f82a7df0b951625 Parents: ae96aac 5a63858 Author: Brandon Williams <[email protected]> Authored: Thu Sep 13 14:03:13 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Sep 13 14:03:13 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 23 +++++++++++++++++++++++ pylib/cqlshlib/pylexotron.py | 4 ++++ 2 files changed, 27 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a946e61d/bin/cqlsh ----------------------------------------------------------------------
