Skip to content

Commit

Permalink
Merge pull request #5 from Azure/master
Browse files Browse the repository at this point in the history
syncing douge fork with remote
  • Loading branch information
erickson-doug authored Nov 3, 2016
2 parents 059427d + 0bdf3f9 commit 200fe0f
Show file tree
Hide file tree
Showing 29 changed files with 19,140 additions and 1,630 deletions.
8 changes: 4 additions & 4 deletions arm-analysisservices/2016-05-16/swagger/analysisservices.json
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,8 @@
"enum": [
"S1",
"S2",
"S4"
"S4",
"D1"
],
"x-ms-enum": {
"name": "SkuName",
Expand All @@ -521,7 +522,7 @@
"tier": {
"type": "string",
"enum": [
"Developer",
"Development",
"Standard"
],
"x-ms-enum": {
Expand All @@ -532,8 +533,7 @@
}
},
"required": [
"name",
"tier"
"name"
]
},
"AnalysisServicesServerMutableProperties": {
Expand Down
Loading

0 comments on commit 200fe0f

Please sign in to comment.