Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6515673 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6515673 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6515673 Branch: refs/heads/trunk Commit: f65156733a11e05e313d9e0a53edf5bf3b120180 Parents: ade99b9 582a16e Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Nov 19 08:31:53 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Nov 19 08:31:53 2013 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------