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/85be04bb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85be04bb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85be04bb Branch: refs/heads/trunk Commit: 85be04bb207826ad8098b1dd5aaf625694fad3c2 Parents: 1267116 3d9c3dd Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Sep 5 11:04:33 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Sep 5 11:04:33 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
