Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f85df374 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f85df374 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f85df374 Branch: refs/heads/trunk Commit: f85df37416db31c0b61acbeedfddbdedafc04634 Parents: 01880a4 54ea2f2 Author: Marcus Eriksson <[email protected]> Authored: Thu Apr 30 12:59:48 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Apr 30 12:59:48 2015 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------
