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/213f6bb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/213f6bb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/213f6bb8 Branch: refs/heads/trunk Commit: 213f6bb883a3072855061ac2528b9403f05398e9 Parents: ef69bd5 731e83b Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Oct 3 22:19:36 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Oct 3 22:19:36 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
