Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c582336b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c582336b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c582336b Branch: refs/heads/trunk Commit: c582336b815aac63c3c1c5e81508248b5f38e432 Parents: 829edc9 edf54ae Author: Michael Shuler <mich...@pbandjelly.org> Authored: Tue Dec 6 17:34:36 2016 -0600 Committer: Michael Shuler <mich...@pbandjelly.org> Committed: Tue Dec 6 17:34:36 2016 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------