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/3a0cd65f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a0cd65f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a0cd65f Branch: refs/heads/trunk Commit: 3a0cd65f339f5771229e058a13396ea5763276af Parents: 7c0c34b e974b6f Author: Brandon Williams <[email protected]> Authored: Fri Apr 25 16:57:32 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Apr 25 16:57:32 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
