Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f135282 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f135282 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f135282 Branch: refs/heads/cassandra-3.0 Commit: 1f13528213bd39e279c3fa931e1a31848362746a Parents: 9b8e187 fe80052 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu Sep 3 15:04:48 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu Sep 3 15:04:48 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
