Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88fea9fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88fea9fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88fea9fe Branch: refs/heads/trunk Commit: 88fea9fe736cae5920a41adc631e734384df0519 Parents: 19767fc 7d45d2b Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Aug 7 18:04:55 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Aug 7 18:04:55 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------