Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/055b8964 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/055b8964 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/055b8964 Branch: refs/heads/trunk Commit: 055b89642f142b089394f219e60b34cb473a6b70 Parents: 56db001 384d4f0 Author: Yuki Morishita <yu...@apache.org> Authored: Mon Aug 18 13:27:06 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Aug 18 13:27:06 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------