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/33060c66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33060c66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33060c66 Branch: refs/heads/trunk Commit: 33060c66d753c33620fe3e9ea8ea020fc745df11 Parents: 2d69ad2 d979ba2 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jul 11 14:22:33 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jul 11 14:22:33 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
