Updated Branches: refs/heads/trunk aae62a76c -> 850440900
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85044090 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85044090 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85044090 Branch: refs/heads/trunk Commit: 850440900b2674146aeb88286e30269d8387f962 Parents: aae62a7 7347d96 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Feb 8 21:54:10 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Feb 8 21:54:10 2013 +0300 ---------------------------------------------------------------------- bin/cqlsh | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) ----------------------------------------------------------------------