Merge branch 'cassandra-2.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/f781f46e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f781f46e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f781f46e Branch: refs/heads/trunk Commit: f781f46e9920169111314d68c3b99d90863fb863 Parents: 7045ff4 bcc68fe Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jul 2 10:39:20 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jul 2 10:39:20 2014 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------