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/4669ab96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4669ab96 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4669ab96 Branch: refs/heads/cassandra-2.1 Commit: 4669ab969bfabebf5731fcb2db9a80f442a7c8eb Parents: 6843b55 7e1adb4 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Jul 29 16:05:40 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Jul 29 16:05:40 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/MessageDeliveryTask.java | 2 +- src/java/org/apache/cassandra/net/MessageIn.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------