Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc20907b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc20907b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc20907b Branch: refs/heads/trunk Commit: cc20907b3c8df79653b5901eb289b913d76aca0a Parents: e2bef02 94ff639 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jun 24 13:06:08 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jun 24 13:06:08 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------