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/56382e38 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56382e38 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56382e38 Branch: refs/heads/trunk Commit: 56382e3853d2fc8ec2a1253737eba5ecd64607c2 Parents: c6462d7 de1f24d Author: Michael Shuler <mich...@pbandjelly.org> Authored: Tue Feb 21 14:01:19 2017 -0600 Committer: Michael Shuler <mich...@pbandjelly.org> Committed: Tue Feb 21 14:01:19 2017 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
