Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74ac6e89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74ac6e89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74ac6e89 Branch: refs/heads/cassandra-2.1 Commit: 74ac6e8962298f4f04c18803d281293a594b7cee Parents: ace0e6e c3aac45 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Mar 14 18:53:48 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Mar 14 18:53:48 2014 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
