You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airflow.apache.org by "ASF subversion and git services (JIRA)" <ji...@apache.org> on 2017/07/24 20:15:00 UTC

[jira] [Commented] (AIRFLOW-1448) Revert PR 2433 which added merge conflicts to master

    [ https://issues.apache.org/jira/browse/AIRFLOW-1448?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16099065#comment-16099065 ] 

ASF subversion and git services commented on AIRFLOW-1448:
----------------------------------------------------------

Commit 426b6a65f6ec142449893e36fcd677941bdad879 in incubator-airflow's branch refs/heads/master from [~aoen]
[ https://git-wip-us.apache.org/repos/asf?p=incubator-airflow.git;h=426b6a6 ]

[AIRFLOW-1448] Revert "Fix cli reading logfile in memory"

This reverts commit
2de4b7cfb12f5a36eeaf5e78d3ee0fb12d67f3b2 which was
breaking CI due to a logical merge conflict.

Closes #2475 from aoen/ddavydov--revert_bad_pr


> Revert PR 2433 which added merge conflicts to master
> ----------------------------------------------------
>
>                 Key: AIRFLOW-1448
>                 URL: https://issues.apache.org/jira/browse/AIRFLOW-1448
>             Project: Apache Airflow
>          Issue Type: Bug
>            Reporter: Dan Davydov
>            Assignee: Dan Davydov
>
> https://github.com/apache/incubator-airflow/pull/2433 has logical merge conflicts in master and causes tests to fail, it needs to be reverted.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)