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/c947c126 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c947c126 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c947c126 Branch: refs/heads/trunk Commit: c947c126f0893f214cae26e8b199a88618e4d6f7 Parents: 0842681 723fcd1 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Feb 4 11:00:15 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Feb 4 11:00:15 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------