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/37f12789 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37f12789 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37f12789 Branch: refs/heads/trunk Commit: 37f1278970dc24f8ebc9777d04510e21ecc54608 Parents: 6d65d26 576a75f Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Jan 21 12:53:25 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Jan 21 12:53:25 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
