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/f56ba7ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f56ba7ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f56ba7ac Branch: refs/heads/cassandra-2.0 Commit: f56ba7ace22306c5bcc56a43bbf52985e3cd63b0 Parents: 90058a9 e39e9e5 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jun 24 13:04:56 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jun 24 13:04:56 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
