Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incu…

…bator-airflow
askmeegs · Sep 8, 2017 · 004a347 · 004a347
2 parents e822425 + ea9ab96
commit 004a347
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/airflow/operators/check_operator.py b/airflow/operators/check_operator.py
@@ -214,9 +214,9 @@ def execute(self, context=None):
         logging.info('Executing SQL check: ' + self.sql1)
         row1 = hook.get_first(self.sql1)
         if not row2:
-            raise AirflowException("The query {q} returned None").format(q=self.sql2)
+            raise AirflowException("The query {q} returned None".format(q=self.sql2))
         if not row1:
-            raise AirflowException("The query {q} returned None").format(q=self.sql1)
+            raise AirflowException("The query {q} returned None".format(q=self.sql1))
         current = dict(zip(self.metrics_sorted, row1))
         reference = dict(zip(self.metrics_sorted, row2))
         ratios = {}

diff --git a/docs/integration.rst b/docs/integration.rst
@@ -295,52 +295,52 @@ Cloud ML Engine
 Cloud ML Engine Operators
 """""""""""""""""""""""""
 
-- :ref:`CloudMLBatchPredictionOperator` : Start a Cloud ML Engine batch prediction job.
-- :ref:`CloudMLModelOperator` : Manages a Cloud ML Engine model.
-- :ref:`CloudMLTrainingOperator` : Start a Cloud ML Engine training job.
-- :ref:`CloudMLVersionOperator` : Manages a Cloud ML Engine model version.
+- :ref:`MLEngineBatchPredictionOperator` : Start a Cloud ML Engine batch prediction job.
+- :ref:`MLEngineModelOperator` : Manages a Cloud ML Engine model.
+- :ref:`MLEngineTrainingOperator` : Start a Cloud ML Engine training job.
+- :ref:`MLEngineVersionOperator` : Manages a Cloud ML Engine model version.
 
-.. _CloudMLBatchPredictionOperator:
+.. _MLEngineBatchPredictionOperator:
 
-CloudMLBatchPredictionOperator
+MLEngineBatchPredictionOperator
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. autoclass:: airflow.contrib.operators.cloudml_operator.CloudMLBatchPredictionOperator
+.. autoclass:: airflow.contrib.operators.mlengine_operator.MLEngineBatchPredictionOperator
     :members:
 
-.. _CloudMLModelOperator:
+.. _MLEngineModelOperator:
 
-CloudMLModelOperator
+MLEngineModelOperator
 ^^^^^^^^^^^^^^^^^^^^
 
-.. autoclass:: airflow.contrib.operators.cloudml_operator.CloudMLModelOperator
+.. autoclass:: airflow.contrib.operators.mlengine_operator.MLEngineModelOperator
     :members:
 
-.. _CloudMLTrainingOperator:
+.. _MLEngineTrainingOperator:
 
-CloudMLTrainingOperator
+MLEngineTrainingOperator
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-.. autoclass:: airflow.contrib.operators.cloudml_operator.CloudMLTrainingOperator
+.. autoclass:: airflow.contrib.operators.mlengine_operator.MLEngineTrainingOperator
     :members:
 
-.. _CloudMLVersionOperator:
+.. _MLEngineVersionOperator:
 
-CloudMLVersionOperator
+MLEngineVersionOperator
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-.. autoclass:: airflow.contrib.operators.cloudml_operator.CloudMLVersionOperator
+.. autoclass:: airflow.contrib.operators.mlengine_operator.MLEngineVersionOperator
     :members:
 
 Cloud ML Engine Hook
 """"""""""""""""""""
 
-.. _CloudMLHook:
+.. _MLEngineHook:
 
-CloudMLHook
+MLEngineHook
 ^^^^^^^^^^^
 
-.. autoclass:: airflow.contrib.hooks.gcp_cloudml_hook.CloudMLHook
+.. autoclass:: airflow.contrib.hooks.gcp_mlengine_hook.MLEngineHook
     :members: