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/b1db3317 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1db3317 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1db3317 Branch: refs/heads/trunk Commit: b1db33175774517a0294a3ebbaadfc3d2006a192 Parents: 22b9e08 2cb95d6 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Nov 19 16:42:45 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Nov 19 16:42:45 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------