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/d245c35c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d245c35c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d245c35c Branch: refs/heads/trunk Commit: d245c35c8787342bfd1874d63fe360647c9c13e9 Parents: 518c0df cf38e9e Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Oct 4 16:32:27 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Oct 4 16:32:27 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
