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/6bc7f765 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bc7f765 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bc7f765 Branch: refs/heads/trunk Commit: 6bc7f76510c498d5570d99be01a169d2207a08a3 Parents: 5b8a6b6 e19431a Author: Yuki Morishita <yu...@apache.org> Authored: Tue Jul 22 16:17:40 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Jul 22 16:17:40 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------