Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be0b451b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be0b451b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be0b451b Branch: refs/heads/trunk Commit: be0b451b7cbe4c75ac5319325908842037e76e94 Parents: 699a69d f02d194 Author: Tyler Hobbs <[email protected]> Authored: Fri Nov 21 15:43:21 2014 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Fri Nov 21 15:43:21 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
