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/c5fdb32c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5fdb32c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5fdb32c Branch: refs/heads/trunk Commit: c5fdb32ceef796514cd0679f425e68c120a3e06e Parents: be6e6ea 83ae5f3 Author: Michael Shuler <mshu...@apache.org> Authored: Mon Oct 10 17:10:10 2016 -0500 Committer: Michael Shuler <mshu...@apache.org> Committed: Mon Oct 10 17:10:10 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------