Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95b57c7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95b57c7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95b57c7c Branch: refs/heads/trunk Commit: 95b57c7cb84f946371ff79a90a8be50165e024ec Parents: 642a453 434d27b Author: Yuki Morishita <yu...@apache.org> Authored: Tue May 26 13:26:58 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue May 26 13:26:58 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------