Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-airflow
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/e8224255 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/e8224255 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/e8224255 Branch: refs/heads/master Commit: e822425575f047425457f964bf29c4bc1aa3e650 Parents: c781ff6 2d40694 Author: Chris Riccomini <criccom...@apache.org> Authored: Thu Sep 7 14:03:41 2017 -0700 Committer: Chris Riccomini <criccom...@apache.org> Committed: Thu Sep 7 14:03:41 2017 -0700 ---------------------------------------------------------------------- README.md | 2 ++ airflow/operators/email_operator.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
