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/025c07ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/025c07ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/025c07ef Branch: refs/heads/trunk Commit: 025c07efd886a048c1c66f653e8411fb1d2912de Parents: 53c95eb a450438 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jun 12 18:47:27 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jun 12 18:47:27 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
