Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c691e09f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c691e09f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c691e09f Branch: refs/heads/cassandra-1.1 Commit: c691e09f149bfc97992593bff1812769e25d6125 Parents: 40bb550 44ac7a0 Author: Sylvain Lebresne <[email protected]> Authored: Wed Feb 22 11:39:44 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Feb 22 11:39:44 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- bin/cqlsh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c691e09f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c691e09f/bin/cqlsh ----------------------------------------------------------------------
