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/9e47591d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e47591d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e47591d Branch: refs/heads/trunk Commit: 9e47591d3a7ab2092e3b72300b1aa86fc9ce04de Parents: fcd657c a0831bb Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Oct 28 11:52:14 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Oct 28 11:52:14 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------