fix bad merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30e2bff6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30e2bff6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30e2bff6 Branch: refs/heads/cassandra-2.1 Commit: 30e2bff696caf07139bbeacfd1a9dd10a9771685 Parents: 743d921 bc6f4d0 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Apr 22 01:49:50 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Apr 22 01:49:50 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------