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/3a82adb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a82adb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a82adb8 Branch: refs/heads/trunk Commit: 3a82adb89a619339bffa676890bc534f0975987e Parents: 5653516 43e6e18 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Feb 6 10:13:04 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Feb 6 10:13:04 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------