Skip to content

Commit 2361737

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into cop
2 parents 4c28b90 + a30024a commit 2361737

File tree

144 files changed

+1707
-6905
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+1707
-6905
lines changed

.github/policies/disallow-edits.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,19 @@ configuration:
153153

154154
- description: Disallow sign-off for articles in the /articles/reliability folder.
155155
if:
156-
# If a 'sign-off' comment is added to a PR in the articles/reliability folder , and the PR author isn't Anastasia or John...
157-
- payloadType: Issue_Comment
158-
- filesMatchPattern:
159-
matchAny: true
160-
pattern: articles/reliability/*
156+
# If a 'sign-off' comment is added to a PR that's assigned to anaharris-ms, and the PR author isn't Anastasia or John...
161157
- or:
162-
- commentContains:
163-
pattern: ^(#sign-off)$
164-
isRegex: True
165-
- commentContains:
166-
pattern: ^(\#sign-off)$
167-
isRegex: True
158+
- payloadType: Issue_Comment
159+
- payloadType: Pull_Request_Review_Comment
160+
- isAction:
161+
action: Created
162+
- isActivitySender:
163+
issueAuthor: True
164+
- isAssignedToUser:
165+
user: anaharris-ms
166+
- commentContains:
167+
pattern: '#sign-off'
168+
isRegex: False
168169
- not:
169170
or:
170171
- isActivitySender:

articles/api-management/retry-policy.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ms.author: danlep
1616

1717
The `retry` policy executes its child policies once and then retries their execution until the retry `condition` becomes `false` or retry `count` is exhausted.
1818

19+
The `retry` policy may contain any other policies as its child elements, except for `wait` policy.
20+
1921
[!INCLUDE [api-management-policy-generic-alert](../../includes/api-management-policy-generic-alert.md)]
2022

2123

@@ -55,7 +57,7 @@ The `retry` policy executes its child policies once and then retries their execu
5557

5658
## Elements
5759

58-
The `retry` policy may contain any other policies as its child elements.
60+
The `retry` policy may contain any other policies as its child elements, except for `wait` policy.
5961

6062
## Usage
6163

articles/app-service/environment/app-service-app-service-environment-control-inbound-traffic.md

Lines changed: 0 additions & 155 deletions
This file was deleted.

articles/app-service/environment/app-service-app-service-environment-create-ilb-ase-resourcemanager.md

Lines changed: 0 additions & 153 deletions
This file was deleted.

0 commit comments

Comments
 (0)