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/edbd7d39 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edbd7d39 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edbd7d39 Branch: refs/heads/trunk Commit: edbd7d3922743ba0c81f61b7c3358249421f3205 Parents: 664efd4 a0923db Author: Tyler Hobbs <ty...@datastax.com> Authored: Thu Aug 21 14:23:17 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Thu Aug 21 14:23:17 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------