Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef20671c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef20671c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef20671c Branch: refs/heads/cassandra-2.1 Commit: ef20671c2c99ab40362785f4718c9e2c13edbda2 Parents: 41d8a5f 64098f7 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Mar 3 15:04:00 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Mar 3 15:04:00 2014 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
