You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2018/08/28 12:26:07 UTC
[GitHub] bolkedebruin closed pull request #3814: [AIRFLOW-XXX] Remove
residual line in Changelog
bolkedebruin closed pull request #3814: [AIRFLOW-XXX] Remove residual line in Changelog
URL: https://github.com/apache/incubator-airflow/pull/3814
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 06d5aed3f1..b4ee1755b4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -780,7 +780,6 @@ AIRFLOW 1.10.0, 2018-08-03
[AIRFLOW-1609] Fix gitignore to ignore all venvs
[AIRFLOW-1601] Add configurable task cleanup time
->>>>>>> 862ad8b9... [AIRFLOW-XXX] Update changelog for 1.10
AIRFLOW 1.9.0, 2018-01-02
-------------------------
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services