Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d215692 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d215692 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d215692 Branch: refs/heads/trunk Commit: 7d215692fdc226b15a72e5459f1d0f24cee8eeda Parents: 8d69214 5d5401d Author: Jason Brown <[email protected]> Authored: Fri Sep 5 16:47:35 2014 -0700 Committer: Jason Brown <[email protected]> Committed: Fri Sep 5 16:47:35 2014 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------
