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/2658c90e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2658c90e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2658c90e Branch: refs/heads/cassandra-2.0 Commit: 2658c90e67bd5e933dde18c8404662fd99b9e105 Parents: 238a020 837bded Author: Brandon Williams <[email protected]> Authored: Fri May 2 16:39:45 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri May 2 16:39:45 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
