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/4f50406a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f50406a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f50406a Branch: refs/heads/trunk Commit: 4f50406af7b5df75049d0fe411d2338aed0f2daa Parents: 200e494 0d38b25 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jan 14 15:20:00 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jan 14 15:20:00 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
