Updated Branches: refs/heads/cassandra-1.0 452619cd0 -> be9fa05d0 refs/heads/cassandra-1.1 5979bce8e -> 51767c198 refs/heads/trunk 9263835ba -> e0925ac49
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/e0925ac4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0925ac4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0925ac4 Branch: refs/heads/trunk Commit: e0925ac49a41119427b9b2c8391bc696058d6610 Parents: 9263835 51767c1 Author: Brandon Williams <[email protected]> Authored: Tue May 15 17:24:56 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 15 17:24:56 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
