Merge commit 'a15c35b0942f91d6f9e45139d99491e189989bde'; commit '07cdfd07a3dc1fe9f9d6e1c24ad926eecae4017a' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0800590f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0800590f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0800590f Branch: refs/heads/trunk Commit: 0800590f96972c866bd6e8ba52f349ff76f98b80 Parents: 2fd3268 a15c35b 07cdfd0 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Feb 27 11:29:30 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Feb 27 11:29:30 2012 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------