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

SQL database, elastic pool, and capabilities 2017-10-01-preview #2734

Merged
merged 12 commits into from
Mar 27, 2018
Merged

SQL database, elastic pool, and capabilities 2017-10-01-preview #2734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
95999c0
Polish up 2017-03 databases
jaredmoo Jan 26, 2018
e61ca67
Moved recommended elastic pools out of sql.core.json.
jaredmoo Mar 6, 2018
6aaae81
Add 2017-10 databases
jaredmoo Feb 3, 2018
901c245
Add 2017-10 pools
jaredmoo Feb 3, 2018
b59c08b
Add 2017-10 capabilities
jaredmoo Feb 6, 2018
a4d7b3d
Added package-composite-v3 tag.
jaredmoo Mar 22, 2018
cc39bca
Fixed model validation warnings
jaredmoo Mar 22, 2018
8141d3d
Fixed -v3 typo
jaredmoo Mar 22, 2018
9505103
Set default package
jaredmoo Mar 23, 2018
6086612
Fixed model validation errors by making minor example edits
jaredmoo Mar 23, 2018
b7dc710
Added capabilities example and fixed delete pool example
jaredmoo Mar 23, 2018
5b2ebc1
Fixed CapabilitiesList example param name
jaredmoo Mar 24, 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
9 changes: 5 additions & 4 deletions specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@
}
}
},
"ArmSku": {
"Sku": {
"description": "An ARM Resource SKU.",
"type": "object",
"properties": {
Expand Down Expand Up @@ -539,6 +539,7 @@
"Default",
"Copy",
"Secondary",
"OnlineSecondary",
"PointInTimeRestore",
"Restore",
"Recovery",
Expand Down Expand Up @@ -620,7 +621,7 @@
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "Status",
"name": "DatabaseStatus",
"modelAsString": true
}
},
Expand Down Expand Up @@ -781,7 +782,7 @@
],
"properties": {
"sku": {
"$ref": "#/definitions/ArmSku",
"$ref": "#/definitions/Sku",
"description": "The name and tier of the SKU."
},
"kind": {
Expand All @@ -801,7 +802,7 @@
"type": "object",
"properties": {
"sku": {
"$ref": "#/definitions/ArmSku",
"$ref": "#/definitions/Sku",
"description": "The name and tier of the SKU."
},
"properties": {
Expand Down
Loading