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

Added x-ms-azure-resource for TrackedResource, and added default values for 2 enums. #2953

Merged
merged 11 commits into from
Apr 30, 2018
Merged

Added x-ms-azure-resource for TrackedResource, and added default values for 2 enums. #2953

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9c3d8ac
Initial placeholder for 2018-05-01-preview version using the contents…
kalyanaj Apr 2, 2018
475cfec
Merge remote-tracking branch 'upstream/master'
kalyanaj Apr 2, 2018
448e858
Changes for the 2018-05-01-preview version.
kalyanaj Apr 2, 2018
afa72e2
Added StorageBlobDeadLetterDestination.
kalyanaj Apr 3, 2018
7cbd8ff
Added an additional enum value CloudEventV01Schema.
kalyanaj Apr 6, 2018
f352308
Merge remote-tracking branch 'upstream/master'
kalyanaj Apr 6, 2018
b3cf793
Merge remote-tracking branch 'upstream/master'
kalyanaj Apr 17, 2018
c15f0a4
Added InputSchema to topic properties.
kalyanaj Apr 18, 2018
2f34640
Tagging endpointType a required property in deadletterdestination.
kalyanaj Apr 18, 2018
3e9fe69
Merge remote-tracking branch 'upstream/master'
kalyanaj Apr 26, 2018
d4938f6
Added x-ms-azure-resource for TrackedResource, and added some default…
kalyanaj Apr 26, 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
12 changes: 8 additions & 4 deletions .../eventgrid/resource-manager/Microsoft.EventGrid/preview/2018-05-01-preview/EventGrid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,7 +1532,8 @@
"x-ms-enum": {
"name": "EventDeliverySchema",
"modelAsString": true
}
},
"default": "EventGridSchema"
},
"retryPolicy": {
"$ref": "#/definitions/RetryPolicy",
Expand Down Expand Up @@ -1847,7 +1848,8 @@
"x-ms-enum": {
"name": "EventDeliverySchema",
"modelAsString": true
}
},
"default": "EventGridSchema"
},
"retryPolicy": {
"$ref": "#/definitions/RetryPolicy",
Expand Down Expand Up @@ -1977,7 +1979,8 @@
"x-ms-enum": {
"name": "InputSchema",
"modelAsString": true
}
},
"default": "EventGridSchema"
},
"inputSchemaMapping": {
"$ref": "#/definitions/InputSchemaMapping",
Expand Down Expand Up @@ -2101,7 +2104,8 @@
"type": "string"
}
}
}
},
"x-ms-azure-resource": true
},
"Topic": {
"description": "EventGrid Topic",
Expand Down