Ryan, No worries I will merge it as is. In the future, consider that PRs remain easier to review if you cherry pick commits or better yet specific files to make the branch merge-able.
Steve Blackmon [email protected] On Wed, Oct 8, 2014 at 4:11 PM, ASF GitHub Bot (JIRA) <[email protected]> wrote: > > [ > https://issues.apache.org/jira/browse/STREAMS-181?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14164178#comment-14164178 > ] > > ASF GitHub Bot commented on STREAMS-181: > ---------------------------------------- > > Github user rbnks commented on the pull request: > > https://github.com/apache/incubator-streams/pull/95#issuecomment-58428396 > > To keep my repo up to date with Apache, I create a pull request and merge > in that pull request from Apache master to my forked repo master. There was > a merge conflict that I had to resolve which is why there are 2 commit hashes. > > If there is a different way I should be merging Apache Master please let > me know. > > >> Refactor RSSProvider >> -------------------- >> >> Key: STREAMS-181 >> URL: https://issues.apache.org/jira/browse/STREAMS-181 >> Project: Streams >> Issue Type: Task >> Reporter: Ryan Ebanks >> >> * Reduce number of threads needed to run rss provider >> * Log unhandled exceptions in threads >> * Add tests. > > > > -- > This message was sent by Atlassian JIRA > (v6.3.4#6332)
