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/87c6ec11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87c6ec11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87c6ec11 Branch: refs/heads/trunk Commit: 87c6ec11c47ff5c96353418d4e318f4ee3f81ddd Parents: c1c3d8f cd381f0 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 10 13:04:50 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 10 13:04:50 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
