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/2e4a8490 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e4a8490 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e4a8490 Branch: refs/heads/trunk Commit: 2e4a8490c4517e30b9897aeadb9161263d2f4abe Parents: b5d6d4f d5b6d1b Author: T Jake Luciani <j...@apache.org> Authored: Tue Jan 26 09:13:37 2016 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Jan 26 09:13:37 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------