From 555788ecfb43b3f3f8a4613015c26d21793115cc Mon Sep 17 00:00:00 2001
From: jikma <jikma@microsoft.com>
Date: Wed, 15 Jul 2020 21:05:20 -0700
Subject: [PATCH] Add clusterloglocation and allow object type for folderpath

---
 .../Microsoft.DataFactory/stable/2018-06-01/datafactory.json  | 4 ++--
 .../stable/2018-06-01/entityTypes/LinkedService.json          | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
index 1419e260fad9..e46d6181e288 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
@@ -5525,8 +5525,8 @@
           "$ref": "#/definitions/LinkedServiceReference"
         },
         "folderPath": {
-          "description": "Folder path for staging blob.",
-          "type": "string"
+          "description": "Folder path for staging blob. Type: string (or Expression with resultType string)",
+          "type": "object"
         }
       }
     },
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
index 8e8356c82b5c..ceff9b5698d1 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
@@ -5260,6 +5260,10 @@
             "description": "Type: string (or Expression with resultType string)."
           }
         },
+        "newClusterLogDestination": {
+          "type": "object",
+          "description": "Specify a location to deliver Spark driver, worker, and event logs. Type: string (or Expression with resultType string)."
+        },
         "newClusterDriverNodeType": {
           "type": "object",
           "description": "The driver node type for the new job cluster. This property is ignored in instance pool configurations. Type: string (or Expression with resultType string)."