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/205b6616 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/205b6616 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/205b6616 Branch: refs/heads/trunk Commit: 205b6616ead9d7740f59cdd1a3f4d5a2c9bf96b1 Parents: c3550fe 9359b7a Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Apr 24 10:22:24 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Apr 24 10:22:24 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
