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/25be4649 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25be4649 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25be4649 Branch: refs/heads/trunk Commit: 25be46497a8df46f05ffa102bc645bfd684ea48a Parents: 827d93e e88bcfe Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Nov 3 15:47:47 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Nov 3 15:47:47 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
