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/cee1f674 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cee1f674 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cee1f674 Branch: refs/heads/cassandra-2.1 Commit: cee1f674aa9bf50710dc3874c2e77698236e4734 Parents: cc276fb 593bba9 Author: Brandon Williams <[email protected]> Authored: Fri Jun 13 13:35:19 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Jun 13 13:35:19 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
