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/7fe5503f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fe5503f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fe5503f Branch: refs/heads/trunk Commit: 7fe5503f21b478a57625eb98ba3b242619b457b1 Parents: 417ebf0 11827f0 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Apr 24 10:22:46 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Apr 24 10:22:46 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------