Updated Branches: refs/heads/cassandra-1.1 4d600f338 -> e7f28f303 refs/heads/trunk 1f3990f12 -> 12691ae3a
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/12691ae3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12691ae3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12691ae3 Branch: refs/heads/trunk Commit: 12691ae3a677ffde37866c1f72648f2ed690b938 Parents: 1f3990f e7f28f3 Author: Brandon Williams <[email protected]> Authored: Mon Sep 17 21:42:25 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Sep 17 21:42:25 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/12691ae3/bin/cqlsh ----------------------------------------------------------------------
