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/2e93398c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e93398c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e93398c Branch: refs/heads/trunk Commit: 2e93398ce715268d6ccefc8589a2d4435e0302aa Parents: 6d770c4 3ec7cb0 Author: Michael Shuler <mich...@pbandjelly.org> Authored: Tue Dec 6 17:33:14 2016 -0600 Committer: Michael Shuler <mich...@pbandjelly.org> Committed: Tue Dec 6 17:33:14 2016 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
