Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1ff5317 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1ff5317 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1ff5317 Branch: refs/heads/cassandra-3.0 Commit: d1ff53171da6348178d029a0fab392849f4d81ce Parents: f490cce 3238906 Author: T Jake Luciani <j...@apache.org> Authored: Tue Aug 25 13:25:38 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Aug 25 13:25:38 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------