From f8c792b75b044e66b07fb82ab7809f01f0b2bbcb Mon Sep 17 00:00:00 2001
From: Kang Tao <kantao@microsoft.com>
Date: Tue, 28 Apr 2020 21:46:32 -0700
Subject: [PATCH 1/2] Update data type of waitTimeInSeconds in WaitActivity

---
 .../stable/2018-06-01/entityTypes/Pipeline.json                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
index c80e37c45c41..bb29409a8054 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
@@ -5907,7 +5907,7 @@
       "properties": {
         "waitTimeInSeconds": {
           "description": "Duration in seconds.",
-          "type": "integer"
+          "type": "object"
         }
       },
       "required": [

From 6809b9537950598bb21dcac77bf049e8003091e9 Mon Sep 17 00:00:00 2001
From: Kang Tao <kantao@microsoft.com>
Date: Wed, 6 May 2020 13:41:12 -0700
Subject: [PATCH 2/2] add global parameters

---
 .../stable/2018-06-01/datafactory.json        | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

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 abb09d4b737c..1419e260fad9 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
@@ -4419,9 +4419,50 @@
         "repoConfiguration": {
           "$ref": "#/definitions/FactoryRepoConfiguration",
           "description": "Git repo information of the factory."
+        },
+        "globalParameters": {
+          "$ref": "#/definitions/GlobalParameterDefinitionSpecification",
+          "description": "List of parameters for factory."
         }
       }
     },
+    "GlobalParameterDefinitionSpecification": {
+      "description": "Definition of all parameters for an entity.",
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#/definitions/GlobalParameterSpecification"
+      }
+    },
+    "GlobalParameterSpecification": {
+      "description": "Definition of a single parameter for an entity.",
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "Global Parameter type.",
+          "enum": [
+            "Object",
+            "String",
+            "Int",
+            "Float",
+            "Bool",
+            "Array"
+          ],
+          "x-ms-enum": {
+            "name": "GlobalParameterType",
+            "modelAsString": true
+          }
+        },
+        "value": {
+          "type": "object",
+          "description": "Value of parameter."
+        }
+      },
+      "required": [
+        "type",
+        "value"
+      ]
+    },
     "PipelineResource": {
       "description": "Pipeline resource type.",
       "type": "object",