From 20e3e1f2952b70fbf624e12aebd1508576a0ba70 Mon Sep 17 00:00:00 2001
From: milantomic6 <mtomic@microsoft.com>
Date: Mon, 2 Oct 2017 11:17:44 -0700
Subject: [PATCH 1/2] Cancel pipeline run api

---
 .../2017-09-01-preview/datafactory.json       | 42 +++++++++++++++++++
 .../examples/Factories_CancelPipelineRun.json | 21 ++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/examples/Factories_CancelPipelineRun.json

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/datafactory.json
index c7c83e64ffd0..cd26a49a9e18 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/datafactory.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/datafactory.json
@@ -1770,6 +1770,48 @@
         }
       }
     },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/cancelpipelinerun/{runId}": {
+      "post": {
+        "operationId": "Factories_CancelPipelineRun",
+        "x-ms-examples": {
+          "Factories_CancelPipelineRun": {
+            "$ref": "./examples/Factories_CancelPipelineRun.json"
+          }
+        },
+        "description": "Cancel pipeline run by its run ID.",
+        "tags": [
+          "pipelineruns"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionId"
+          },
+          {
+            "$ref": "#/parameters/resourceGroupName"
+          },
+          {
+            "$ref": "#/parameters/factoryName"
+          },
+          {
+            "$ref": "#/parameters/runId"
+          },
+          {
+            "$ref": "#/parameters/api-version"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK."
+          },
+          "default": {
+            "description": "An error response received from the Azure Data Factory service.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers": {
       "get": {
         "tags": [
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/examples/Factories_CancelPipelineRun.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/examples/Factories_CancelPipelineRun.json
new file mode 100644
index 000000000000..5b03267619e1
--- /dev/null
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/examples/Factories_CancelPipelineRun.json
@@ -0,0 +1,21 @@
+{
+  "parameters": {
+    "subscriptionId": "12345678-1234-1234-12345678abc",
+    "resourceGroupName": "exampleResourceGroup",
+    "factoryName": "exampleFactoryName",
+    "runId": "39692ed9-c722-4d33-b8e1-1f4a9deac57f",
+    "api-version": "2017-09-01-preview"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Date": "Mon, 02 Oct 2017 17:27:33 GMT",
+        "x-ms-request-id": "fd3867ea-c65c-470d-a17b-d83c8864cf90",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-ratelimit-remaining-subscription-writes": "1113",
+        "x-ms-correlation-request-id": "d0b45db5-c155-4991-95d9-22655c72c986"
+      },
+      "body": null
+    }
+  }
+}
\ No newline at end of file

From 7ed62553610960496b39076af66f6490367db3f7 Mon Sep 17 00:00:00 2001
From: milantomic6 <mtomic@microsoft.com>
Date: Tue, 3 Oct 2017 13:11:06 -0700
Subject: [PATCH 2/2] CR issues

---
 .../Microsoft.DataFactory/2017-09-01-preview/datafactory.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/datafactory.json
index cd26a49a9e18..14712908d0d6 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/datafactory.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/datafactory.json
@@ -1778,7 +1778,7 @@
             "$ref": "./examples/Factories_CancelPipelineRun.json"
           }
         },
-        "description": "Cancel pipeline run by its run ID.",
+        "description": "Cancel a pipeline run by its run ID.",
         "tags": [
           "pipelineruns"
         ],
@@ -1801,7 +1801,7 @@
         ],
         "responses": {
           "200": {
-            "description": "OK."
+            "description": "Pipeline run has been canceled successfully. "
           },
           "default": {
             "description": "An error response received from the Azure Data Factory service.",