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/6a7235e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a7235e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a7235e9 Branch: refs/heads/trunk Commit: 6a7235e9e24e999130e1c2f411dcd91ea1b70760 Parents: 55ce317 0623ea8 Author: Tyler Hobbs <ty...@datastax.com> Authored: Wed Aug 13 11:34:54 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Wed Aug 13 11:34:54 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------