Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated NetworkConfigurationDiagnostic API + example - PLEASE close this PR. This feature will be in the next release #3901

Closed
wants to merge 9 commits into from
Closed

Updated NetworkConfigurationDiagnostic API + example - PLEASE close this PR. This feature will be in the next release #3901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5867e27
ServiceBus: 2018-01-01 Preview - for managing Namespace, IPFilter Rul…
Sep 12, 2018
1cff2ef
Add mariadb swagger spec (#3797)
elemount Sep 12, 2018
5fdf492
Swagger spec for disk.json + compute.json 2018-06 (#3854)
Sep 12, 2018
8b107a7
Update .travis.yml (#3888)
lmazuel Sep 12, 2018
53e853a
Generate readme.md file for azure-arm-mariadb until one is provided (…
Sep 13, 2018
edee830
Fix Go SDK codegen for mariadb (#3892)
jhendrixMSFT Sep 13, 2018
19800d8
[DO NOT MERGE] Added list support to VA policies (#3878)
t-robalt Sep 13, 2018
b55dc2b
Fix incorrect url and clarify subscription-level disable (unsure why …
asinn826 Sep 13, 2018
ea178ff
Updated NetworkConfigurationDiagnostic API + example
irrogozh Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ script:
fi
- >-
if [[ $MODE == 'java' ]]; then
travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-libraries-for-java -v
travis_wait 30 scripts/swagger-to-sdk.sh Azure/azure-sdk-for-java -v
fi
- >-
if [[ $MODE == 'branchStrategy' ]]; then
Expand Down
28 changes: 25 additions & 3 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5164,11 +5164,12 @@
},
"StorageAccountType": {
"type": "string",
"description": "Specifies the storage account type for the managed disk. Possible values are: Standard_LRS, Premium_LRS, and StandardSSD_LRS.",
"description": "Specifies the storage account type for the managed disk. UltraSSD_LRS can only be used for data disks.",
"enum": [
"Standard_LRS",
"Premium_LRS",
"StandardSSD_LRS"
"StandardSSD_LRS",
"UltraSSD_LRS"
],
"x-ms-enum": {
"name": "StorageAccountTypes",
Expand All @@ -5179,7 +5180,7 @@
"properties": {
"storageAccountType": {
"$ref": "#/definitions/StorageAccountType",
"description": "Specifies the storage account type for the managed disk. Possible values are: Standard_LRS, Premium_LRS, and StandardSSD_LRS."
"description": "Specifies the storage account type for the managed disk. UltraSSD_LRS can only be used for data disks."
}
},
"allOf": [
Expand Down Expand Up @@ -5313,6 +5314,15 @@
},
"description": "Specifies the storage settings for the virtual machine disks."
},
"AdditionalCapabilities": {
"properties": {
"ultraSSDEnabled": {
"type": "boolean",
"description": "Enables or disables a capability to have 1 or more managed data disks with UltraSSD_LRS storage account on the VM or VMSS. Managed disks with storage account type UltraSSD_LRS can be added to a virtual machine or virtual machine scale set only if this property is enabled."
}
},
"description": "Enables or disables a capability on the virtual machine or virtual machine scale set"
},
"AdditionalUnattendContent": {
"properties": {
"passName": {
Expand Down Expand Up @@ -5830,6 +5840,10 @@
"$ref": "#/definitions/StorageProfile",
"description": "Specifies the storage settings for the virtual machine disks."
},
"additionalCapabilities": {
"$ref": "#/definitions/AdditionalCapabilities",
"description": "Specifies additional capabilities enabled or disabled on the virtual machine. For instance: whether the virtual machine has the capability to support attaching managed data disks with UltraSSD_LRS storage account type."
},
"osProfile": {
"$ref": "#/definitions/OSProfile",
"description": "Specifies the operating system settings for the virtual machine."
Expand Down Expand Up @@ -7022,6 +7036,10 @@
"$ref": "#/definitions/VirtualMachineScaleSetStorageProfile",
"description": "Specifies the storage settings for the virtual machine disks."
},
"additionalCapabilities": {
"$ref": "#/definitions/AdditionalCapabilities",
"description": "Specifies additional capabilities enabled or disabled on the virtual machine in the scale set. For instance: whether the virtual machine has the capability to support attaching managed data disks with UltraSSD_LRS storage account type."
},
"networkProfile": {
"$ref": "#/definitions/VirtualMachineScaleSetNetworkProfile",
"description": "Specifies properties of the network interfaces of the virtual machines in the scale set."
Expand Down Expand Up @@ -7588,6 +7606,10 @@
"$ref": "#/definitions/StorageProfile",
"description": "Specifies the storage settings for the virtual machine disks."
},
"additionalCapabilities": {
"$ref": "#/definitions/AdditionalCapabilities",
"description": "Specifies additional capabilities enabled or disabled on the virtual machine in the scale set. For instance: whether the virtual machine has the capability to support attaching managed data disks with UltraSSD_LRS storage account type."
},
"osProfile": {
"$ref": "#/definitions/OSProfile",
"description": "Specifies the operating system settings for the virtual machine."
Expand Down
Loading