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/57fc8fd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57fc8fd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57fc8fd6 Branch: refs/heads/trunk Commit: 57fc8fd6d2ece80f5221a5f08241bf6487a8356e Parents: 4ca1a4d ad40451 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu May 1 18:53:08 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu May 1 18:53:08 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
