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/32ac6af2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32ac6af2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32ac6af2 Branch: refs/heads/trunk Commit: 32ac6af2ba936c23e61d2ac4ab9cd32175cb5176 Parents: bee53d7 ffa8067 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Tue Dec 16 15:06:32 2014 -0600 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Tue Dec 16 15:06:32 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
