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/3841f9cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3841f9cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3841f9cb Branch: refs/heads/trunk Commit: 3841f9cb2041a7af43cbda3ff7c85e78216a6d22 Parents: a907533 5cafe86 Author: T Jake Luciani <j...@apache.org> Authored: Wed Nov 25 09:21:41 2015 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Wed Nov 25 09:21:41 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------