Updated Branches: refs/heads/trunk 5f1e66a15 -> dd822376b
Merge branch '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/dd822376 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd822376 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd822376 Branch: refs/heads/trunk Commit: dd822376b160b51cc4fac22e1a52a1cc5c1eeb47 Parents: 5f1e66a f733836 Author: Eric Evans <[email protected]> Authored: Fri Apr 6 10:42:32 2012 -0500 Committer: Eric Evans <[email protected]> Committed: Fri Apr 6 10:42:32 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 69 +++++++++++++++++++++++++++----- bin/cqlshrc.sample | 3 + lib/cql-internal-only-1.0.10.zip | Bin 0 -> 68142 bytes lib/cql-internal-only-1.0.8.zip | Bin 58455 -> 0 bytes pylib/cqlshlib/cqlhandling.py | 2 + 5 files changed, 63 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
