From f45b0175776f7186c79f09c8d9c9c65280e20ea4 Mon Sep 17 00:00:00 2001
From: SDKAuto <sdkautomation@microsoft.com>
Date: Thu, 12 Nov 2020 01:49:22 +0000
Subject: [PATCH] CodeGen from PR 11640 in Azure/azure-rest-api-specs Merge
 f15a8ed489e803b88c6f220f2fe433ed20bbc951 into
 5ef5a597b3f2342bfd254ed79b97b2fe160e50a1

---
 .../Microsoft.DataFactory.json                |  2 +-
 schemas/2018-06-01/Microsoft.DataFactory.json | 46 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/schemas/2017-09-01-preview/Microsoft.DataFactory.json b/schemas/2017-09-01-preview/Microsoft.DataFactory.json
index bdfc2aa0e4..51ef6d0139 100644
--- a/schemas/2017-09-01-preview/Microsoft.DataFactory.json
+++ b/schemas/2017-09-01-preview/Microsoft.DataFactory.json
@@ -12175,4 +12175,4 @@
       "description": "Zoho server dataset."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json
index 01795066a6..08f41de0d2 100644
--- a/schemas/2018-06-01/Microsoft.DataFactory.json
+++ b/schemas/2018-06-01/Microsoft.DataFactory.json
@@ -10616,6 +10616,11 @@
           ],
           "description": "Compute properties for data flow activity."
         },
+        "continueOnError": {
+          "type": "object",
+          "properties": {},
+          "description": "Continue on error setting used for data flow execution. Enables processing to continue if a sink fails. Type: boolean (or Expression with resultType boolean)"
+        },
         "dataFlow": {
           "oneOf": [
             {
@@ -10638,6 +10643,11 @@
           ],
           "description": "Integration runtime reference type."
         },
+        "runConcurrently": {
+          "type": "object",
+          "properties": {},
+          "description": "Concurrent run setting used for data flow execution. Allows sinks with the same save order to be processed concurrently. Type: boolean (or Expression with resultType boolean)"
+        },
         "staging": {
           "oneOf": [
             {
@@ -10648,6 +10658,11 @@
             }
           ],
           "description": "Staging info for execute data flow activity."
+        },
+        "traceLevel": {
+          "type": "object",
+          "properties": {},
+          "description": "Trace level setting used for data flow monitoring output. Supported values are: 'coarse', 'fine', and 'none'. Type: string (or Expression with resultType string)"
         }
       },
       "required": [
@@ -10659,31 +10674,14 @@
       "type": "object",
       "properties": {
         "computeType": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "General",
-                "MemoryOptimized",
-                "ComputeOptimized"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Compute type of the cluster which will execute data flow job."
+          "type": "object",
+          "properties": {},
+          "description": "Compute type of the cluster which will execute data flow job. Possible values include: 'General', 'MemoryOptimized', 'ComputeOptimized'. Type: string (or Expression with resultType string)"
         },
         "coreCount": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Core count of the cluster which will execute data flow job. Supported values are: 8, 16, 32, 48, 80, 144 and 272."
+          "type": "object",
+          "properties": {},
+          "description": "Core count of the cluster which will execute data flow job. Supported values are: 8, 16, 32, 48, 80, 144 and 272. Type: integer (or Expression with resultType integer)"
         }
       },
       "description": "Compute properties for data flow activity."
@@ -28195,4 +28193,4 @@
       "description": "A copy activity Zoho server source."
     }
   }
-}
\ No newline at end of file
+}