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/54956e98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54956e98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54956e98 Branch: refs/heads/trunk Commit: 54956e984b1af1a0906807874b773702bf8f2406 Parents: 27c2088 4012134 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue May 12 18:40:23 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue May 12 18:40:23 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
