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/36394542 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36394542 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36394542 Branch: refs/heads/cassandra-3.0 Commit: 36394542e6e350b49396ed1b09fecdaba76aece8 Parents: 9f02182 7e056fa Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Nov 13 09:57:17 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Nov 13 09:57:17 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
