Merge remote-tracking branch 'upstream/master'

Azure · Mar 23, 2018 · a8d47d1 · a8d47d1
2 parents 6388784 + f71c7c3
commit a8d47d1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/specification/compute/quickstart-templates/aliases.json b/specification/compute/quickstart-templates/aliases.json
@@ -32,7 +32,7 @@
           "openSUSE-Leap": {
             "publisher":"SUSE",
             "offer":"openSUSE-Leap",
-            "sku":"42.2",
+            "sku":"42.3",
             "version": "latest"
           },
           "RHEL":{

diff --git a/...anager/Microsoft.Subscription/preview/2018-03-01-preview/examples/createSubscription.json b/...anager/Microsoft.Subscription/preview/2018-03-01-preview/examples/createSubscription.json
@@ -12,7 +12,13 @@
         {
           "objectId": "67439a9e-8519-4016-a630-f5f805eba567"
         }
-      ]
+      ],
+      "additionalParameters": {
+        "customData": {
+          "key1": "value1",
+          "key2": true
+        }
+      }
     }
   },
   "responses": {

diff --git a/...ion/resource-manager/Microsoft.Subscription/preview/2018-03-01-preview/subscriptions.json b/...ion/resource-manager/Microsoft.Subscription/preview/2018-03-01-preview/subscriptions.json
@@ -172,6 +172,13 @@
             "MS-AZR-0017P",
             "MS-AZR-0148P"
           ]
+        },
+        "additionalParameters": {  
+          "description": "Additional, untyped parameters to support custom subscription creation scenarios.",
+          "type": "object",
+          "additionalProperties": {  
+            "type": "object"
+          }
         }
       }
     },