Merge commit 'd1c4d50ee05cb6be19d60c2e58a19b0e1fb93023' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3726a383 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3726a383 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3726a383 Branch: refs/heads/trunk Commit: 3726a383d16e14f422a98f440835ecdb78df8278 Parents: a7d950e d1c4d50 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Aug 6 12:51:43 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Aug 6 12:51:43 2014 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------