Merge branch '1557'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/df8e331e Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/df8e331e Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/df8e331e Branch: refs/heads/master Commit: df8e331ef1ecc4b6f7817e2b2d12b1b0ceb7d8a1 Parents: 0a5364c 115fe1c Author: Siddharth Anand <san...@agari.com> Authored: Tue May 31 17:44:45 2016 -0700 Committer: Siddharth Anand <san...@agari.com> Committed: Tue May 31 17:44:45 2016 -0700 ---------------------------------------------------------------------- airflow/bin/cli.py | 8 ++++++-- tests/core.py | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) ----------------------------------------------------------------------