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/1a00f001 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a00f001 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a00f001 Branch: refs/heads/cassandra-2.2 Commit: 1a00f001fad5636b846062b340237c1a331d77ac Parents: c8136b9 f6deca3 Author: Joshua McKenzie <[email protected]> Authored: Fri Dec 4 14:22:02 2015 -0500 Committer: Joshua McKenzie <[email protected]> Committed: Fri Dec 4 14:22:02 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
