Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a9dd3d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a9dd3d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a9dd3d9 Branch: refs/heads/trunk Commit: 5a9dd3d993082c5e458a2c00e612208f9dd1d13f Parents: d62382b fd14512 Author: Jonathan Ellis <[email protected]> Authored: Fri Aug 9 15:56:28 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Aug 9 15:56:28 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
