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/b40b98d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b40b98d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b40b98d3 Branch: refs/heads/trunk Commit: b40b98d361bab28dcf5bd3902aa306ee3e852d30 Parents: 7ae6178 c612a36 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 24 12:50:24 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 24 12:50:24 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
