Updated Branches: refs/heads/cassandra-1.1 6dddf360e -> 0cc168a96 refs/heads/trunk 72a2e528c -> d0d21aded
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/d0d21ade Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0d21ade Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0d21ade Branch: refs/heads/trunk Commit: d0d21aded73af5879ea3e2422269c0023da75d11 Parents: 72a2e52 0cc168a Author: Brandon Williams <[email protected]> Authored: Mon Jun 18 13:11:16 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Jun 18 13:11:16 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
