Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb1c773c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb1c773c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb1c773c Branch: refs/heads/trunk Commit: bb1c773c9f1ac0c44792e6836f43905d69cbdec4 Parents: 83f8ccc a4c767e Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Dec 4 13:10:00 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Dec 4 13:10:00 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------