Merge branch 'master' into v1-8-test
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/3fe53cb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/3fe53cb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/3fe53cb0 Branch: refs/heads/v1-8-test Commit: 3fe53cb0ef1f8761068b44f2e5ef62bbbb8f8d63 Parents: 5584230 a6b1481 Author: Chris Riccomini <[email protected]> Authored: Thu Jan 5 16:22:11 2017 -0800 Committer: Chris Riccomini <[email protected]> Committed: Thu Jan 5 16:22:11 2017 -0800 ---------------------------------------------------------------------- README.md | 1 + airflow/configuration.py | 5 +++-- airflow/contrib/auth/backends/ldap_auth.py | 2 +- airflow/utils/email.py | 11 +++++++++-- tests/core.py | 15 +++++++++++++++ 5 files changed, 29 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
