Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/426caf7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/426caf7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/426caf7c Branch: refs/heads/trunk Commit: 426caf7c03f9e109115f5d8e26a694c03cf8f0c7 Parents: 885ba11 3205c10 Author: Jonathan Ellis <[email protected]> Authored: Tue Aug 6 16:56:10 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Aug 6 16:56:10 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
