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/230cca58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/230cca58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/230cca58 Branch: refs/heads/trunk Commit: 230cca580aa9a2c8704b41b29c0b6b2343478adc Parents: 4a4ea06 c9b83e0 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Mar 31 11:58:47 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Mar 31 11:58:47 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------