Updated Branches: refs/heads/cassandra-1.0 9fc1d5c23 -> 270d0165d refs/heads/cassandra-1.1 1c6b75698 -> 8ac731efa refs/heads/cassandra-1.1.0 81e609d3f -> e3c4c095f refs/heads/trunk d97a671f5 -> b651778c4
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/b651778c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b651778c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b651778c Branch: refs/heads/trunk Commit: b651778c4c4db8845767892f53339efeefcab677 Parents: d97a671 8ac731e Author: Brandon Williams <[email protected]> Authored: Tue Mar 27 14:31:10 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Mar 27 14:31:10 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 111 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 77 insertions(+), 34 deletions(-) ----------------------------------------------------------------------
