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/2f866483 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f866483 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f866483 Branch: refs/heads/trunk Commit: 2f866483c7b27814ede14bf700353e68679e76fd Parents: 63059a8 1d81765 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jan 29 09:53:02 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jan 29 09:53:02 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
