From 8f450203257c4d587b5056954e6246e7be18c6e4 Mon Sep 17 00:00:00 2001
From: Varad Meru <vrdmr@users.noreply.github.com>
Date: Thu, 28 Jun 2018 17:00:04 -0700
Subject: [PATCH] Fix for JobStream duplicate definitions (#3327)

* Fix for JobStream duplicate definitions

* Updating JobStreamProperties in all the places
---
 .../Microsoft.Automation/preview/2017-05-15-preview/job.json | 5 +++--
 .../Microsoft.Automation/stable/2015-10-31/runbook.json      | 5 +++--
 .../stable/2018-01-15/dscCompilationJob.json                 | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/job.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/job.json
index a1447a2c5449..501e357e972f 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/job.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/job.json
@@ -636,8 +636,8 @@
         "time": {
           "type": "string",
           "format": "date-time",
-          "x-nullable": false,
-          "description": "Gets or sets the creation time of the job."
+          "description": "Gets or sets the creation time of the job.",
+          "x-nullable": false
         },
         "streamType": {
           "type": "string",
@@ -672,6 +672,7 @@
           "description": "Gets or sets the values of the job stream."
         }
       },
+      "x-ms-client-flatten": true,
       "description": "Definition of the job stream."
     },
     "JobStreamListResult": {
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/runbook.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/runbook.json
index 87a447d59b2e..570bba46aa5c 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/runbook.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/runbook.json
@@ -1062,8 +1062,8 @@
         "time": {
           "type": "string",
           "format": "date-time",
-          "x-nullable": false,
-          "description": "Gets or sets the creation time of the job."
+          "description": "Gets or sets the creation time of the job.",
+          "x-nullable": false
         },
         "streamType": {
           "type": "string",
@@ -1098,6 +1098,7 @@
           "description": "Gets or sets the values of the job stream."
         }
       },
+      "x-ms-client-flatten": true,
       "description": "Definition of the job stream."
     },
     "JobStreamListResult": {
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscCompilationJob.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscCompilationJob.json
index de2bee4573fb..f64b0d34c175 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscCompilationJob.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscCompilationJob.json
@@ -588,6 +588,7 @@
           "description": "Gets or sets the values of the job stream."
         }
       },
+      "x-ms-client-flatten": true,
       "description": "Definition of the job stream."
     },
     "JobProvisioningStateProperty": {