Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3d1e38a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3d1e38a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3d1e38a Branch: refs/heads/trunk Commit: e3d1e38a44a84f4689c4f352144a2132d0da6fa2 Parents: fd888bc db69dce Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jan 13 08:23:02 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jan 13 08:23:02 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------