Updated Branches: refs/heads/trunk a9e091910 -> aa187053b
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/aa187053 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa187053 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa187053 Branch: refs/heads/trunk Commit: aa187053ba2cf9e003c87aa8da8bd284f67a0841 Parents: a9e0919 40bb550 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Feb 22 11:35:11 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Feb 22 11:35:11 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa187053/CHANGES.txt ----------------------------------------------------------------------