Skip to content

Commit b9c3d0a

Browse files
pjw711pjw711
committed
Resolve conflicts
2 parents 37cd892 + 01966a0 commit b9c3d0a

File tree

4,527 files changed

+52763
-34315
lines changed

Some content is hidden

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

4,527 files changed

+52763
-34315
lines changed

‎.github/policies/disallow-edits.yml

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
name: GitOps.PullRequestIssueManagement
2+
description: GitOps.PullRequestIssueManagement primitive
3+
resource: repository
4+
5+
configuration:
6+
resourceManagementConfiguration:
7+
eventResponderTasks:
8+
- description: Close PRs that contain content for services that have been migrated out of the azure-docs-pr repository.
9+
if:
10+
- payloadType: Pull_Request
11+
- isAction:
12+
action: Opened
13+
- or:
14+
- filesMatchPattern:
15+
matchAny: true
16+
pattern: articles/aks/*
17+
- filesMatchPattern:
18+
matchAny: true
19+
pattern: articles/defender-for-cloud/*
20+
- filesMatchPattern:
21+
matchAny: true
22+
pattern: articles/attestation/*
23+
- filesMatchPattern:
24+
matchAny: true
25+
pattern: articles/confidential-ledger/*
26+
- filesMatchPattern:
27+
matchAny: true
28+
pattern: articles/dedicated-hsm/*
29+
- filesMatchPattern:
30+
matchAny: true
31+
pattern: articles/key-vault/*
32+
- filesMatchPattern:
33+
matchAny: true
34+
pattern: articles/payment-hsm/*
35+
- filesMatchPattern:
36+
matchAny: true
37+
pattern: articles/postgresql/*
38+
- filesMatchPattern:
39+
matchAny: true
40+
pattern: articles/cosmos-db/*
41+
- filesMatchPattern:
42+
matchAny: true
43+
pattern: articles/dms/*
44+
- filesMatchPattern:
45+
matchAny: true
46+
pattern: articles/mariadb/*
47+
- filesMatchPattern:
48+
matchAny: true
49+
pattern: articles/mysql/*
50+
- filesMatchPattern:
51+
matchAny: true
52+
pattern: articles/managed-instance-apache-cassandra/*
53+
- filesMatchPattern:
54+
matchAny: true
55+
pattern: articles/virtual-machines/*
56+
- filesMatchPattern:
57+
matchAny: true
58+
pattern: articles/virtual-machines-scale-sets/*
59+
- filesMatchPattern:
60+
matchAny: true
61+
pattern: articles/container-instances/*
62+
- filesMatchPattern:
63+
matchAny: true
64+
pattern: articles/service-fabric/*
65+
- filesMatchPattern:
66+
matchAny: true
67+
pattern: articles/machine-learning/*
68+
- filesMatchPattern:
69+
matchAny: true
70+
pattern: articles/ai-studio/*
71+
- filesMatchPattern:
72+
matchAny: true
73+
pattern: articles/ai-services/*
74+
- filesMatchPattern:
75+
matchAny: true
76+
pattern: articles/genomics/*
77+
- filesMatchPattern:
78+
matchAny: true
79+
pattern: articles/open-datasets/*
80+
- filesMatchPattern:
81+
matchAny: true
82+
pattern: articles/search/*
83+
- filesMatchPattern:
84+
matchAny: true
85+
pattern: articles/azure-monitor/*
86+
- filesMatchPattern:
87+
matchAny: true
88+
pattern: articles/advisor/*
89+
- filesMatchPattern:
90+
matchAny: true
91+
pattern: articles/chaos-studio/*
92+
- filesMatchPattern:
93+
matchAny: true
94+
pattern: articles/service-health/*
95+
- filesMatchPattern:
96+
matchAny: true
97+
pattern: articles/azure-arc/*
98+
- filesMatchPattern:
99+
matchAny: true
100+
pattern: articles/azure-linux/*
101+
- filesMatchPattern:
102+
matchAny: true
103+
pattern: articles/azure-portal/*
104+
- filesMatchPattern:
105+
matchAny: true
106+
pattern: articles/copilot/*
107+
- filesMatchPattern:
108+
matchAny: true
109+
pattern: articles/lighthouse/*
110+
- filesMatchPattern:
111+
matchAny: true
112+
pattern: articles/quotas/*
113+
- filesMatchPattern:
114+
matchAny: true
115+
pattern: articles/container-registry/*
116+
- filesMatchPattern:
117+
matchAny: true
118+
pattern: articles/kubernetes-fleet/*
119+
then:
120+
- addReply:
121+
reply: >-
122+
@${issueAuthor} - You tried to add content to a folder path that has been removed from this repository. Your pull request will be automatically closed. Submit your changes to the updated repository, which can be identified by clicking the Edit this Document link at the top of any published article for that product or service.
123+
- closePullRequest
124+

‎.openpublishing.publish.config.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,6 @@
254254
"branch": "main",
255255
"branch_mapping": {}
256256
},
257-
{
258-
"path_to_root": "azure-reference-other-repo",
259-
"url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
260-
"branch": "main",
261-
"branch_mapping": {}
262-
},
263257
{
264258
"path_to_root": "azure-sdk-for-go-samples",
265259
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",

0 commit comments

Comments
 (0)