Merge branch '1527'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/edf4a7c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/edf4a7c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/edf4a7c2 Branch: refs/heads/master Commit: edf4a7c2ddbd8a79632bc55c52a155e1caca24c4 Parents: 8bf335b af11640 Author: Dan Davydov <dan.davy...@airbnb.com> Authored: Fri May 20 10:31:54 2016 -0700 Committer: Dan Davydov <dan.davy...@airbnb.com> Committed: Fri May 20 10:31:54 2016 -0700 ---------------------------------------------------------------------- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------