merge from upstream branch

matthchr · Apr 21, 2017 · 702ef06 · 702ef06
2 parents 492bc08 + 61d2f8b
commit 702ef06
Show file tree

Hide file tree

Showing 332 changed files with 58,685 additions and 2,863 deletions.
diff --git a/arm-analysisservices/2016-05-16/swagger/analysisservices.json b/arm-analysisservices/2016-05-16/swagger/analysisservices.json
@@ -475,6 +475,9 @@
         "name": {
           "type": "string",
           "enum": [
+            "B1",
+            "B2",
+            "S0",
             "S1",
             "S2",
             "S4",
@@ -484,19 +487,20 @@
             "name": "SkuName",
             "modelAsString": true
           },
-          "description": "Name of the SKU level for the server being provisioned. Possible values are: 'S1', 'S2', 'S4', and 'D1'."
+          "description": "Name of the SKU level for the server being provisioned."
         },
         "tier": {
           "type": "string",
           "enum": [
             "Development",
+            "Basic",
             "Standard"
           ],
           "x-ms-enum": {
             "name": "SkuTier",
             "modelAsString": true
           },
-          "description": "The name of the Azure pricing tier to which the SKU applies. Possible values are: 'Development' and 'Standard'."
+          "description": "The name of the Azure pricing tier to which the SKU applies."
         }
       },
       "required": [