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/fc1fc936 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc1fc936 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc1fc936 Branch: refs/heads/trunk Commit: fc1fc93647f1e30d460fab47b78dcbddb20b0187 Parents: 424fb48 46a26ed Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Nov 4 12:55:56 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Nov 4 12:55:56 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
