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/dc1dad32 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc1dad32 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc1dad32 Branch: refs/heads/trunk Commit: dc1dad32871ee41e3df5e132439429da0d918424 Parents: c979868 2777e1e Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Feb 17 17:09:12 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Feb 17 17:09:12 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------