Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1914a111 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1914a111 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1914a111 Branch: refs/heads/trunk Commit: 1914a1116c2ec5d7fb11792d2d63512045eba8fc Parents: fd50a2f 9de8d3e Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jun 3 10:35:39 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jun 3 10:35:39 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------