Ok, thanks for the clarification!

Erik

________________________________
From: Maxime Beauchemin <maximebeauche...@gmail.com>
Sent: Friday, August 4, 2017 6:58:11 PM
To: dev@airflow.incubator.apache.org
Subject: Re: [AIRFLOW-840] missing in 1.8 stable?

Personally I attempted to pick all JIRAs targeting 1.8.x when backing
1.8.2, and left anything that had merge conflicts out. Ideally we'd be
careful about the order in which we pick cherries to match the ordering in
master and that may minimize the merge conflicts, but in reality this would
be tricky to achieve without custom tooling.

It's soon time to bake 1.9.0 out of master (as soon as we figure out our
release logistic with the ASF, see the VOTE release threads if you want to
follow the progress there). There won't be any merge issues when doing that.

Max

On Thu, Aug 3, 2017 at 4:19 AM, EKC (Erik Cederstrand) <e...@novozymes.com>
wrote:

> Hi all,
>
>
> I submitted [AIRFLOW-840] back in February, and a fix was committed on the
> master branch in 
> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fapache%2Fincubator-airflow%2Fcommit%2F&data=01%7C01%7CEKC%40novozymes.com%7Cd3f9df7ad04349e39a3c08d4db5a05cc%7C43d5f49ee03a4d22a2285684196bb001%7C0&sdata=0MsT%2Bkhcd7xk0lDayv0Yg5Q%2B9vAH5dLJ0kC5r%2Bk0LuY%3D&reserved=0
> 6393366a781c0c6c5806a830d419929296d71a08 on March 29.
> <https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fapache%2Fincubator-airflow%2Fcommit%2F&data=01%7C01%7CEKC%40novozymes.com%7Cd3f9df7ad04349e39a3c08d4db5a05cc%7C43d5f49ee03a4d22a2285684196bb001%7C0&sdata=0MsT%2Bkhcd7xk0lDayv0Yg5Q%2B9vAH5dLJ0kC5r%2Bk0LuY%3D&reserved=0
> 6393366a781c0c6c5806a830d419929296d71a08>
>
>
> But for some reason, it has never been applied to v1_8_stable. Is there a
> particular reason for that?
> <https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fapache%2Fincubator-airflow%2Fcommit%2F&data=01%7C01%7CEKC%40novozymes.com%7Cd3f9df7ad04349e39a3c08d4db5a05cc%7C43d5f49ee03a4d22a2285684196bb001%7C0&sdata=0MsT%2Bkhcd7xk0lDayv0Yg5Q%2B9vAH5dLJ0kC5r%2Bk0LuY%3D&reserved=0
> 6393366a781c0c6c5806a830d419929296d71a08>
>
>
> Thanks,
>
> Erik
>
>

Reply via email to