[ https://issues.apache.org/jira/browse/GEODE-409?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14974775#comment-14974775 ]
ASF subversion and git services commented on GEODE-409: ------------------------------------------------------- Commit f0b81325fc2595ec61f562a9f774fd9991a1cbfc in incubator-geode's branch refs/heads/develop from [~dschneider] [ https://git-wip-us.apache.org/repos/asf?p=incubator-geode.git;h=f0b8132 ] Merge remote-tracking branch 'origin/develop' into feature/GEODE-409 All the conflicts had to do with the HDFS files being removed and those same files being modified on develop because of copyright work. > CI cleanup > ----------- > > Key: GEODE-409 > URL: https://issues.apache.org/jira/browse/GEODE-409 > Project: Geode > Issue Type: Task > Reporter: William Markito Oliveira > Labels: ci, squashaton > > CI cleanup master ticket > This is part of the "squashathon" effort to clean up CI failures. > Tickets fixed as part of this effort should have this ticket as parent. -- This message was sent by Atlassian JIRA (v6.3.4#6332)