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/06bfa06b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06bfa06b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06bfa06b Branch: refs/heads/cassandra-3.0 Commit: 06bfa06bbd154499aa9f09efebd53f0d41210358 Parents: 0b9f6de 943db24 Author: Michael Shuler <mich...@pbandjelly.org> Authored: Wed Feb 15 18:11:17 2017 -0600 Committer: Michael Shuler <mich...@pbandjelly.org> Committed: Wed Feb 15 18:11:17 2017 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
