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/87fe1e09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87fe1e09 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87fe1e09 Branch: refs/heads/cassandra-3.1 Commit: 87fe1e09f15b373fd74473dddee12e289287b7aa Parents: 9fc957c 6bad57f Author: Joshua McKenzie <jmcken...@apache.org> Authored: Wed Nov 11 15:03:24 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Wed Nov 11 15:03:24 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------