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/c08842f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/c08842f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/c08842f3 Branch: refs/heads/master Commit: c08842f3ce82d5631d0d10a6407284d13b6901e5 Parents: c616eaa 1932ccc Author: Chris Riccomini <criccom...@apache.org> Authored: Mon Jul 31 13:30:49 2017 -0700 Committer: Chris Riccomini <criccom...@apache.org> Committed: Mon Jul 31 13:30:49 2017 -0700 ---------------------------------------------------------------------- airflow/contrib/operators/cloudml_operator.py | 16 +++- .../contrib/operators/cloudml_operator_utils.py | 84 ++++++++++++-------- airflow/contrib/operators/dataflow_operator.py | 2 + .../operators/test_cloudml_operator_utils.py | 40 +++++----- 4 files changed, 91 insertions(+), 51 deletions(-) ----------------------------------------------------------------------
