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/00628e70 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00628e70 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00628e70 Branch: refs/heads/trunk Commit: 00628e70a52f4cfa0ca6abfd295ba03f77298293 Parents: 99594cd 2df27c0 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Jun 12 03:11:39 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Jun 12 03:11:39 2014 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------
