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.

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

Remove duplication of TrackedResource in mariaDB and mySQL #10601

Merged
merged 1 commit into from
Aug 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1307,34 +1307,6 @@
}
}
},
"TrackedResource": {
"description": "Resource properties including location and tags for track resources.",
"properties": {
"location": {
"type": "string",
"x-ms-mutability": [
"read",
"create"
],
"description": "The location the resource resides in."
},
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Application-specific metadata in the form of key-value pairs."
}
},
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"required": [
"location"
]
},
"ServerProperties": {
"properties": {
"administratorLogin": {
Expand Down Expand Up @@ -1615,7 +1587,7 @@
},
"allOf": [
{
"$ref": "#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
}
],
"description": "Represents a server."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1531,30 +1531,6 @@
}
}
},
"TrackedResource": {
"description": "Resource properties including location and tags for track resources.",
"properties": {
"location": {
"type": "string",
"description": "The location the resource resides in."
},
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Application-specific metadata in the form of key-value pairs."
}
},
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"required": [
"location"
]
},
"ServerProperties": {
"properties": {
"administratorLogin": {
Expand Down Expand Up @@ -1890,7 +1866,7 @@
},
"allOf": [
{
"$ref": "#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
}
],
"description": "Represents a server."
Expand Down