Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f25375a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f25375a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f25375a Branch: refs/heads/trunk Commit: 3f25375a3c6c4442114589357fa1f714015aa09e Parents: 0ed57bf cc77ac8 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu May 1 18:56:33 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu May 1 18:56:33 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
