Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14943766 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14943766 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14943766 Branch: refs/heads/trunk Commit: 14943766ef48d8e2e7a1c6978512904c5a1d5aaa Parents: d410a71 a7202ef Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jul 31 18:23:08 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jul 31 18:23:08 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
