Merge remote-tracking branch 'upstream/master'

Azure · Aug 26, 2015 · fb91a70 · fb91a70
2 parents da243ca + 23988dd
commit fb91a70
Showing 1 changed file with 26 additions and 1 deletion.
diff --git a/arm-logic/2015-02-01-preview/swagger/logic.json b/arm-logic/2015-02-01-preview/swagger/logic.json
@@ -1823,6 +1823,16 @@
                     "readOnly": true,
                     "description": "Gets the status."
                 },
+                "code": {
+                    "type": "string",
+                    "readOnly": true,
+                    "description": "Gets the code."
+                },
+                "error": {
+                    "$ref": "#/definitions/Object",
+                    "readOnly": true,
+                    "description": "Gets the error."
+                },
                 "correlationId": {
                     "type": "string",
                     "readOnly": true,
@@ -1842,7 +1852,7 @@
                     "type": "object",
                     "readOnly": true,
                     "additionalProperties": {
-                        "$ref": "#/definitions/WorkflowParameter"
+                        "$ref": "#/definitions/WorkflowOutputParameter"
                     },
                     "description": "Gets the outputs."
                 }
@@ -2100,6 +2110,21 @@
                 }
             }
         },
+        "WorkflowOutputParameter": {
+            "type": "object",
+            "properties": {
+                "error": {
+                    "$ref": "#/definitions/Object",
+                    "readOnly": true,
+                    "description": "Gets the error."
+                }
+            },
+            "allOf": [
+                {
+                    "$ref": "WorkflowParameter"
+                }
+            ]
+        },
         "RegenerateSecretKeyParameters": {
             "type": "object",
             "properties": {