Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d4dc6d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d4dc6d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d4dc6d5 Branch: refs/heads/trunk Commit: 8d4dc6d5f2db5d19476d79c8b56e7e3d2f61e2d5 Parents: 0a09edc c7e472e Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue May 6 22:41:30 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue May 6 22:41:30 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------