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/55d8da44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55d8da44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55d8da44 Branch: refs/heads/trunk Commit: 55d8da44bc270c1dcaef013dec287e9cb9b6865f Parents: 0520aeb c92b20b Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Feb 19 08:33:25 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Feb 19 08:33:25 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
