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/e2209d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2209d59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e2209d59 Branch: refs/heads/trunk Commit: e2209d5983a623659bac4693e8afb815771cd54c Parents: cd381f0 1997b7b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 10 13:52:35 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 10 13:52:35 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
