@@ -134,7 +134,20 @@ input-file:
134
134
- stable/2023-06-30/FlexibleServers.json
135
135
- stable/2023-06-30/LogFiles.json
136
136
- stable/2023-06-30/ServiceOperations.json
137
+ <<<<<<< Updated upstream
137
138
- preview/2023-10-01-preview/Maintenances.json
139
+ =======
140
+ - stable/2023-06-30/PrivateEndpointConnections.json
141
+ - stable/2023-06-30/PrivateLinkResources.json
142
+ - common-types/v1/common-types.json
143
+ suppressions:
144
+ - code: PostOperationAsyncResponseValidation
145
+ from: FlexibleServers.json
146
+ reason: This check is optional.
147
+ - code: PropertiesTypeObjectNoDefinition
148
+ from: common-types.json
149
+ reason: This will be fixed in new versions.
150
+ >>>>>>> Stashed changes
138
151
` ` `
139
152
140
153
# ## Tag: package-flexibleserver-2023-10-01-preview
@@ -175,11 +188,11 @@ input-file:
175
188
- preview/2023-10-01-preview/Maintenances.json
176
189
` ` `
177
190
178
- # ## Tag: package-flexibleserver-2023-12-30
191
+ # ## Tag: package-flexibleserver-2023-12-30-preview
179
192
180
- These settings apply only when `--tag=package-flexibleserver-2023-12-30` is specified on the command line.
193
+ These settings apply only when `--tag=package-flexibleserver-2023-12-30-preview ` is specified on the command line.
181
194
182
- ` ` ` yaml $(tag) == 'package-flexibleserver-2023-12-30'
195
+ ` ` ` yaml $(tag) == 'package-flexibleserver-2023-12-30-preview '
183
196
input-file:
184
197
- preview/2023-06-01-preview/AzureADAdministrator.json
185
198
- preview/2023-10-01-preview/Backups.json
@@ -195,11 +208,11 @@ input-file:
195
208
- preview/2023-10-01-preview/Maintenances.json
196
209
` ` `
197
210
198
- # ## Tag: package-flexibleserver-2024-01-01
211
+ # ## Tag: package-flexibleserver-2023-12-30
199
212
200
- These settings apply only when `--tag=package-flexibleserver-2024-01-01 ` is specified on the command line.
213
+ These settings apply only when `--tag=package-flexibleserver-2023-12-30 ` is specified on the command line.
201
214
202
- ` ` ` yaml $(tag) == 'package-flexibleserver-2024-01-01 '
215
+ ` ` ` yaml $(tag) == 'package-flexibleserver-2023-12-30 '
203
216
input-file:
204
217
- stable/2023-12-30/AzureADAdministrator.json
205
218
- stable/2023-12-30/Backups.json
@@ -275,6 +288,7 @@ input-file:
275
288
- stable/2023-12-30/Maintenances.json
276
289
` ` `
277
290
291
+ <<<<<<< Updated upstream
278
292
# ## Tag: package-flexibleserver-2023-06-30-privatelink
279
293
280
294
These settings apply only when `--tag=package-flexibleserver-2023-06-30-privatelink` is specified on the command line.
@@ -285,6 +299,8 @@ input-file:
285
299
- stable/2023-06-30/PrivateLinkResources.json
286
300
` ` `
287
301
302
+ =======
303
+ >>>>>>> Stashed changes
288
304
# ## Tag: package-flexibleserver-2022-01-01
289
305
290
306
These settings apply only when `--tag=package-flexibleserver-2022-01-01` is specified on the command line.
0 commit comments