Skip to content

Commit bbe78d7

Browse files
committed
clean tag
1 parent 026bb85 commit bbe78d7

File tree

1 file changed

+22
-6
lines changed
  • specification/mysql/resource-manager/Microsoft.DBforMySQL/FlexibleServers

1 file changed

+22
-6
lines changed

specification/mysql/resource-manager/Microsoft.DBforMySQL/FlexibleServers/readme.md

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,20 @@ input-file:
134134
- stable/2023-06-30/FlexibleServers.json
135135
- stable/2023-06-30/LogFiles.json
136136
- stable/2023-06-30/ServiceOperations.json
137+
<<<<<<< Updated upstream
137138
- 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
138151
```
139152

140153
### Tag: package-flexibleserver-2023-10-01-preview
@@ -175,11 +188,11 @@ input-file:
175188
- preview/2023-10-01-preview/Maintenances.json
176189
```
177190

178-
### Tag: package-flexibleserver-2023-12-30
191+
### Tag: package-flexibleserver-2023-12-30-preview
179192

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.
181194

182-
``` yaml $(tag) == 'package-flexibleserver-2023-12-30'
195+
``` yaml $(tag) == 'package-flexibleserver-2023-12-30-preview'
183196
input-file:
184197
- preview/2023-06-01-preview/AzureADAdministrator.json
185198
- preview/2023-10-01-preview/Backups.json
@@ -195,11 +208,11 @@ input-file:
195208
- preview/2023-10-01-preview/Maintenances.json
196209
```
197210

198-
### Tag: package-flexibleserver-2024-01-01
211+
### Tag: package-flexibleserver-2023-12-30
199212

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.
201214

202-
``` yaml $(tag) == 'package-flexibleserver-2024-01-01'
215+
``` yaml $(tag) == 'package-flexibleserver-2023-12-30'
203216
input-file:
204217
- stable/2023-12-30/AzureADAdministrator.json
205218
- stable/2023-12-30/Backups.json
@@ -275,6 +288,7 @@ input-file:
275288
- stable/2023-12-30/Maintenances.json
276289
```
277290

291+
<<<<<<< Updated upstream
278292
### Tag: package-flexibleserver-2023-06-30-privatelink
279293

280294
These settings apply only when `--tag=package-flexibleserver-2023-06-30-privatelink` is specified on the command line.
@@ -285,6 +299,8 @@ input-file:
285299
- stable/2023-06-30/PrivateLinkResources.json
286300
```
287301

302+
=======
303+
>>>>>>> Stashed changes
288304
### Tag: package-flexibleserver-2022-01-01
289305

290306
These settings apply only when `--tag=package-flexibleserver-2022-01-01` is specified on the command line.

0 commit comments

Comments
 (0)