Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f873a327 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f873a327 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f873a327 Branch: refs/heads/trunk Commit: f873a3278603135c494713136cea4e343b0e765f Parents: 3d0e54e 5de9c17 Author: Brandon Williams <bran...@datastax.com> Authored: Thu Jul 17 15:49:35 2014 -0500 Committer: Brandon Williams <bran...@datastax.com> Committed: Thu Jul 17 15:49:35 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------