Ghetto merge branch 'cassandra-1.2' into trunk pending another patch for 5234
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d4e470b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d4e470b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d4e470b Branch: refs/heads/trunk Commit: 3d4e470baa0cf53ef84a36f96db6645e17770fbf Parents: e5e7225 33a3d2c Author: Brandon Williams <[email protected]> Authored: Wed Jun 26 16:58:46 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Jun 26 16:58:46 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
