Merge tag '1.10.15' into upstream/v2

Apache Airflow 1.10.15

- Fix `airflow db upgrade` to upgrade db as intended (apache#13267)
- Moved boto3 limitation to snowflake (apache#13286)
- `KubernetesExecutor` should accept images from `executor_config` (apache#13074)
- Scheduler should acknowledge active runs properly (apache#13803)
- Bugfix: Unable to import Airflow plugins on Python 3.8 (apache#12859)
- Include `airflow/contrib/executors` in the dist package
- Pin Click version for Python 2.7 users
- Ensure all statsd timers use millisecond values. (apache#10633)
- [`kubernetes_generate_dag_yaml`] - Fix dag yaml generate function (apache#13816)
- Fix `airflow tasks clear` cli command wirh `--yes` (apache#14188)
- Fix permission error on non-POSIX filesystem (apache#13121) (apache#14383)
- Fixed deprecation message for "variables" command (apache#14457)
- BugFix: fix the `delete_dag` function of json_client (apache#14441)
- Fix merging of secrets and configmaps for `KubernetesExecutor` (apache#14090)
- Fix webserver exiting when gunicorn master crashes (apache#13470)
- Bump ini from 1.3.5 to 1.3.8 in `airflow/www_rbac`
- Bump datatables.net from 1.10.21 to 1.10.23 in `airflow/www_rbac`
- Webserver: Sanitize string passed to origin param (apache#14738)
- Make `rbac_app`'s `db.session` use the same timezone with `@provide_session` (apache#14025)

- Adds airflow as viable docker command in official image (apache#12878)
- `StreamLogWriter`: Provide (no-op) close method (apache#10885)
- Add 'airflow variables list' command for 1.10.x transition version (apache#14462)

- Update URL for Airflow docs (apache#13561)
- Clarifies version args for installing 1.10 in Docker (apache#12875)

.coveragerc

@@ -24,4 +24,3 @@ omit =
     airflow/migrations/*
     airflow/www/node_modules/**
     airflow/www_rbac/node_modules/**
-    airflow/_vendor/*

.dockerignore

@@ -31,25 +31,38 @@
 !common
 !dags
 !dev
+!chart
 !docs
 !licenses
-!scripts
+!metastore_browser
+
+# Add those folders to the context so that they are available in the CI container
+!scripts/in_container
+!scripts/docker
+
+# Add backport packages to the context
+!backport_packages
+
+# Add tests and kubernetes_tests to context.
 !tests
+!kubernetes_tests
 
 !.coveragerc
 !.rat-excludes
 !.flake8
 !.dockerignore
 !pytest.ini
 !CHANGELOG.txt
-!Dockerfile.ci
-!Dockerfile
 !LICENSE
 !MANIFEST.in
 !NOTICE
 !.github
-!requirements
-!entrypoint.sh
+!empty
+
+# This folder is for you if you want to add any packages to the docker context when you build your own
+# docker image. most of other files and any new folder you add will be excluded by default
+# if you need other types of files - please add the extensions here.
+!docker-context-files
 
 # Avoid triggering context change on README change (new companies using Airflow)
 # So please do not uncomment this line ;)

.flake8

@@ -1,5 +1,5 @@
 [flake8]
 max-line-length = 110
 ignore = E731,W504,I001,W503
-exclude = .svn,CVS,.bzr,.hg,.git,__pycache__,.eggs,*.egg,*/_vendor/*,node_modules
+exclude = .svn,CVS,.bzr,.hg,.git,__pycache__,.eggs,*.egg,node_modules
 format = ${cyan}%(path)s${reset}:${yellow_bold}%(row)d${reset}:${green_bold}%(col)d${reset}: ${red_bold}%(code)s${reset} %(text)s

.gitattributes

@@ -0,0 +1 @@
+/chart export-ignore

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,23 @@
-- [ ] Description above provides context of the change
-- [ ] Commit message contains [\[AIRFLOW-XXXX\]](https://issues.apache.org/jira/browse/AIRFLOW-XXXX) or `[AIRFLOW-XXXX]` for document-only changes
-- [ ] Unit tests coverage for changes (not needed for documentation changes)
-- [ ] Commits follow "[How to write a good git commit message](http://chris.beams.io/posts/git-commit/)"
-- [ ] Relevant documentation is updated including usage instructions.
-- [ ] I will engage committers as explained in [Contribution Workflow Example](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#contribution-workflow-example).
+<!--
+Thank you for contributing! Please make sure that your code changes
+are covered with tests. And in case of new features or big changes
+remember to adjust the documentation.
+
+Feel free to ping committers for the review!
+
+In case of existing issue, reference it using one of the following:
+
+closes: #ISSUE
+related: #ISSUE
+
+How to write a good git commit message:
+http://chris.beams.io/posts/git-commit/
+-->
+
+---
+**^ Add meaningful description above**
+
+Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
 In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
 In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
 In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
-Read the [Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines) for more information.