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/bd92b0f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd92b0f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd92b0f7 Branch: refs/heads/trunk Commit: bd92b0f70cf1c455aa640e7c3591ad92166ae919 Parents: 5a9b1b4 00628e7 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Jun 12 03:12:14 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Jun 12 03:12:14 2014 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------