Merge branch 'cassandra-2.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/4b2e946f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b2e946f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b2e946f Branch: refs/heads/trunk Commit: 4b2e946f6155874ca79bcce2f96d1e3a985f0d32 Parents: 85014df dc7d5a0 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Jul 16 15:59:07 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Jul 16 15:59:07 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------