Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb55843c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb55843c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb55843c Branch: refs/heads/trunk Commit: bb55843c1c1d23cf169af2abc5ea4647a84a943f Parents: c7834d3 6caf426 Author: Jake Luciani <j...@apache.org> Authored: Tue Aug 12 10:26:06 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Tue Aug 12 10:26:06 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------