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/5c0ddfbb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c0ddfbb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c0ddfbb Branch: refs/heads/cassandra-2.0 Commit: 5c0ddfbba2f80c043b96a61878ca46d5283f7b05 Parents: a26ac36 ee2ed3c Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Aug 1 13:56:38 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Aug 1 13:56:38 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
