Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6aaa0231 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6aaa0231 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6aaa0231 Branch: refs/heads/trunk Commit: 6aaa023171162ee1b42c6de21f2ef60a49948fc5 Parents: 68baaed 66a8a55 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Jan 19 11:16:18 2014 -0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Jan 19 11:16:18 2014 -0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/MessagingService.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6aaa0231/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------