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/de55c39c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de55c39c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de55c39c Branch: refs/heads/cassandra-2.2 Commit: de55c39cd2efeb66a1adace391bbe456213559e8 Parents: 85c7241 994250c Author: T Jake Luciani <j...@apache.org> Authored: Tue Dec 15 14:16:55 2015 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Dec 15 14:16:55 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------