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/2cb95d69 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cb95d69 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cb95d69 Branch: refs/heads/trunk Commit: 2cb95d698c7d9a00fa81f6917252e11266ad04de Parents: 41358f6 5097032 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Nov 19 16:42:41 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Nov 19 16:42:41 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
