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/d9124ed6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9124ed6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9124ed6

Branch: refs/heads/cassandra-1.1
Commit: d9124ed68cc6683ba131399794ddae4330507953
Parents: 9f90a79 1ad1c12
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Wed Feb 22 11:30:50 2012 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Wed Feb 22 11:30:50 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt |    1 +
 bin/cqlsh   |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9124ed6/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9124ed6/bin/cqlsh
----------------------------------------------------------------------

Reply via email to