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/0f72f79d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f72f79d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f72f79d Branch: refs/heads/trunk Commit: 0f72f79d5f9ed54cb9b9e33d371f4f13eae21dca Parents: 4adf29d 5d88ff4 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Apr 17 16:49:07 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Apr 17 16:49:07 2015 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------