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/c2b6dd45 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2b6dd45 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2b6dd45 Branch: refs/heads/trunk Commit: c2b6dd4503dc8f11a98fbb2c732b21179997f894 Parents: 8c43b8c 542bb1f Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Aug 31 17:10:38 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Aug 31 17:10:38 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------