Merge branch 'disable_dask'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/cec04ad3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/cec04ad3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/cec04ad3 Branch: refs/heads/master Commit: cec04ad34b07f7d263199681963f06917992a8d3 Parents: 8942d2e 51180d3 Author: Bolke de Bruin <[email protected]> Authored: Tue Dec 19 15:54:55 2017 +0100 Committer: Bolke de Bruin <[email protected]> Committed: Tue Dec 19 15:54:55 2017 +0100 ---------------------------------------------------------------------- .travis.yml | 20 ++++++++++---------- tests/executors/dask_executor.py | 22 +++++++++------------- tox.ini | 4 ++-- 3 files changed, 21 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
