Updated Branches: refs/heads/cassandra-1.1 6ad7d45ad -> 4d600f338 refs/heads/trunk 0666e1952 -> 1f3990f12
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/1f3990f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f3990f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f3990f1 Branch: refs/heads/trunk Commit: 1f3990f122cc77c3f52f72189a7430119fc5125e Parents: 0666e19 4d600f3 Author: Brandon Williams <[email protected]> Authored: Mon Sep 17 20:44:20 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Sep 17 20:44:20 2012 -0500 ---------------------------------------------------------------------- bin/cqlsh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f3990f1/bin/cqlsh ----------------------------------------------------------------------
