Merge branch '1582'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/6270dcf9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/6270dcf9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/6270dcf9 Branch: refs/heads/master Commit: 6270dcf93c3b27a08fe67a4c9ecca6cfae219dd7 Parents: 01952b3 d31ff09 Author: Dan Davydov <dan.davy...@airbnb.com> Authored: Wed Jun 15 11:47:52 2016 -0700 Committer: Dan Davydov <dan.davy...@airbnb.com> Committed: Wed Jun 15 11:47:52 2016 -0700 ---------------------------------------------------------------------- airflow/bin/cli.py | 11 ++++++++--- airflow/configuration.py | 7 ++++++- 2 files changed, 14 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
