Skip to content

Commit 64fd681

Browse files
tomvcassidytomvcassidy
committed
resolving merge conflicts in redirection file
1 parent a2a239d commit 64fd681

File tree

2 files changed

+325
-325
lines changed

2 files changed

+325
-325
lines changed

‎.openpublishing.redirection.json

Lines changed: 0 additions & 325 deletions
Original file line numberDiff line numberDiff line change
@@ -1,330 +1,5 @@
11
{
22
"redirections": [
3-
{
4-
"source_path": "articles/cloud-services/applications-dont-support-tls-1-2.md",
5-
"redirect_url": "/previous-versions/azure/cloud-services/applications-dont-support-tls-1-2",
6-
"redirect_document_id": false
7-
},
8-
{
9-
"source_path": "articles/cloud-services/automation-manage-cloud-services.md",
10-
"redirect_url": "/previous-versions/azure/cloud-services/automation-manage-cloud-services",
11-
"redirect_document_id": false
12-
},
13-
{
14-
"source_path": "articles/cloud-services/cloud-services-allocation-failures.md",
15-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-allocation-failures",
16-
"redirect_document_id": false
17-
},
18-
{
19-
"source_path": "articles/cloud-services/cloud-services-certs-create.md",
20-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-certs-create",
21-
"redirect_document_id": false
22-
},
23-
{
24-
"source_path": "articles/cloud-services/cloud-services-choose-me.md",
25-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-choose-me",
26-
"redirect_document_id": false
27-
},
28-
{
29-
"source_path": "articles/cloud-services/cloud-services-configure-ssl-certificate-portal.md",
30-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-configure-ssl-certificate-portal",
31-
"redirect_document_id": false
32-
},
33-
{
34-
"source_path": "articles/cloud-services/cloud-services-connect-to-custom-domain.md",
35-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-connect-to-custom-domain",
36-
"redirect_document_id": false
37-
},
38-
{
39-
"source_path": "articles/cloud-services/cloud-services-custom-domain-name-portal.md",
40-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-custom-domain-name-portal",
41-
"redirect_document_id": false
42-
},
43-
{
44-
"source_path": "articles/cloud-services/cloud-services-diagnostics-powershell.md",
45-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-diagnostics-powershell",
46-
"redirect_document_id": false
47-
},
48-
{
49-
"source_path": "articles/cloud-services/cloud-services-disaster-recovery-guidance.md",
50-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-disaster-recovery-guidance",
51-
"redirect_document_id": false
52-
},
53-
{
54-
"source_path": "articles/cloud-services/cloud-services-dotnet-diagnostics-trace-flow.md",
55-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-dotnet-diagnostics-trace-flow",
56-
"redirect_document_id": false
57-
},
58-
{
59-
"source_path": "articles/cloud-services/cloud-services-dotnet-diagnostics.md",
60-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-dotnet-diagnostics",
61-
"redirect_document_id": false
62-
},
63-
{
64-
"source_path": "articles/cloud-services/cloud-services-dotnet-get-started.md",
65-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-dotnet-get-started",
66-
"redirect_document_id": false
67-
},
68-
{
69-
"source_path": "articles/cloud-services/cloud-services-dotnet-install-dotnet.md",
70-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-dotnet-install-dotnet",
71-
"redirect_document_id": false
72-
},
73-
{
74-
"source_path": "articles/cloud-services/cloud-services-enable-communication-role-instances.md",
75-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-enable-communication-role-instances",
76-
"redirect_document_id": false
77-
},
78-
{
79-
"source_path": "articles/cloud-services/cloud-services-guestos-family-2-3-4-retirement.md",
80-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-family-2-3-4-retirement",
81-
"redirect_document_id": false
82-
},
83-
{
84-
"source_path": "articles/cloud-services/cloud-services-guestos-family1-retirement.md",
85-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-family1-retirement",
86-
"redirect_document_id": false
87-
},
88-
{
89-
"source_path": "articles/cloud-services/cloud-services-guestos-msrc-releases.md",
90-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-msrc-releases",
91-
"redirect_document_id": false
92-
},
93-
{
94-
"source_path": "articles/cloud-services/cloud-services-guestos-retirement-policy.md",
95-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-retirement-policy",
96-
"redirect_document_id": false
97-
},
98-
{
99-
"source_path": "articles/cloud-services/cloud-services-guestos-update-matrix.md",
100-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-update-matrix",
101-
"redirect_document_id": false
102-
},
103-
{
104-
"source_path": "articles/cloud-services/cloud-services-how-to-configure-portal.md",
105-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-how-to-configure-portal",
106-
"redirect_document_id": false
107-
},
108-
{
109-
"source_path": "articles/cloud-services/cloud-services-how-to-create-deploy-portal.md",
110-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-how-to-create-deploy-portal",
111-
"redirect_document_id": false
112-
},
113-
{
114-
"source_path": "articles/cloud-services/cloud-services-how-to-manage-portal.md",
115-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-how-to-manage-portal",
116-
"redirect_document_id": false
117-
},
118-
{
119-
"source_path": "articles/cloud-services/cloud-services-how-to-monitor.md",
120-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-how-to-monitor",
121-
"redirect_document_id": false
122-
},
123-
{
124-
"source_path": "articles/cloud-services/cloud-services-how-to-scale-portal.md",
125-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-how-to-scale-portal",
126-
"redirect_document_id": false
127-
},
128-
{
129-
"source_path": "articles/cloud-services/cloud-services-how-to-scale-powershell.md",
130-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-how-to-scale-powershell",
131-
"redirect_document_id": false
132-
},
133-
{
134-
"source_path": "articles/cloud-services/cloud-services-model-and-package.md",
135-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-model-and-package",
136-
"redirect_document_id": false
137-
},
138-
{
139-
"source_path": "articles/cloud-services/cloud-services-nodejs-chat-app-socketio.md",
140-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-nodejs-chat-app-socketio",
141-
"redirect_document_id": false
142-
},
143-
{
144-
"source_path": "articles/cloud-services/cloud-services-nodejs-develop-deploy-app.md",
145-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-nodejs-develop-deploy-app",
146-
"redirect_document_id": false
147-
},
148-
{
149-
"source_path": "articles/cloud-services/cloud-services-nodejs-develop-deploy-express-app.md",
150-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-nodejs-develop-deploy-express-app",
151-
"redirect_document_id": false
152-
},
153-
{
154-
"source_path": "articles/cloud-services/cloud-services-performance-testing-visual-studio-profiler.md",
155-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-performance-testing-visual-studio-profiler",
156-
"redirect_document_id": false
157-
},
158-
{
159-
"source_path": "articles/cloud-services/cloud-services-php-create-web-role.md",
160-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-php-create-web-role",
161-
"redirect_document_id": false
162-
},
163-
{
164-
"source_path": "articles/cloud-services/cloud-services-powershell-create-cloud-container.md",
165-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-powershell-create-cloud-container",
166-
"redirect_document_id": false
167-
},
168-
{
169-
"source_path": "articles/cloud-services/cloud-services-python-how-to-use-service-management.md",
170-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-python-how-to-use-service-management",
171-
"redirect_document_id": false
172-
},
173-
{
174-
"source_path": "articles/cloud-services/cloud-services-python-ptvs.md",
175-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-python-ptvs",
176-
"redirect_document_id": false
177-
},
178-
{
179-
"source_path": "articles/cloud-services/cloud-services-role-config-xpath.md",
180-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-role-config-xpath",
181-
"redirect_document_id": false
182-
},
183-
{
184-
"source_path": "articles/cloud-services/cloud-services-role-enable-remote-desktop-new-portal.md",
185-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-role-enable-remote-desktop-new-portal",
186-
"redirect_document_id": false
187-
},
188-
{
189-
"source_path": "articles/cloud-services/cloud-services-role-enable-remote-desktop-powershell.md",
190-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-role-enable-remote-desktop-powershell",
191-
"redirect_document_id": false
192-
},
193-
{
194-
"source_path": "articles/cloud-services/cloud-services-role-enable-remote-desktop-visual-studio.md",
195-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-role-enable-remote-desktop-visual-studio",
196-
"redirect_document_id": false
197-
},
198-
{
199-
"source_path": "articles/cloud-services/cloud-services-role-lifecycle-dotnet.md",
200-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-role-lifecycle-dotnet",
201-
"redirect_document_id": false
202-
},
203-
{
204-
"source_path": "articles/cloud-services/cloud-services-sizes-specs.md",
205-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-sizes-specs",
206-
"redirect_document_id": false
207-
},
208-
{
209-
"source_path": "articles/cloud-services/cloud-services-startup-tasks-common.md",
210-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-startup-tasks-common",
211-
"redirect_document_id": false
212-
},
213-
{
214-
"source_path": "articles/cloud-services/cloud-services-startup-tasks.md",
215-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-startup-tasks",
216-
"redirect_document_id": false
217-
},
218-
{
219-
"source_path": "articles/cloud-services/cloud-services-troubleshoot-common-issues-which-cause-roles-recycle.md",
220-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-troubleshoot-common-issues-which-cause-roles-recycle",
221-
"redirect_document_id": false
222-
},
223-
{
224-
"source_path": "articles/cloud-services/cloud-services-troubleshoot-constrained-allocation-failed.md",
225-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-troubleshoot-constrained-allocation-failed",
226-
"redirect_document_id": false
227-
},
228-
{
229-
"source_path": "articles/cloud-services/cloud-services-troubleshoot-default-temp-folder-size-too-small-web-worker-role.md",
230-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-troubleshoot-default-temp-folder-size-too-small-web-worker-role",
231-
"redirect_document_id": false
232-
},
233-
{
234-
"source_path": "articles/cloud-services/cloud-services-troubleshoot-deployment-problems.md",
235-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-troubleshoot-deployment-problems",
236-
"redirect_document_id": false
237-
},
238-
{
239-
"source_path": "articles/cloud-services/cloud-services-troubleshoot-fabric-internal-server-error.md",
240-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-troubleshoot-fabric-internal-server-error",
241-
"redirect_document_id": false
242-
},
243-
{
244-
"source_path": "articles/cloud-services/cloud-services-troubleshoot-location-not-found-for-role-size.md",
245-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-troubleshoot-location-not-found-for-role-size",
246-
"redirect_document_id": false
247-
},
248-
{
249-
"source_path": "articles/cloud-services/cloud-services-troubleshoot-overconstrained-allocation-request.md",
250-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-troubleshoot-overconstrained-allocation-request",
251-
"redirect_document_id": false
252-
},
253-
{
254-
"source_path": "articles/cloud-services/cloud-services-troubleshoot-roles-that-fail-start.md",
255-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-troubleshoot-roles-that-fail-start",
256-
"redirect_document_id": false
257-
},
258-
{
259-
"source_path": "articles/cloud-services/cloud-services-update-azure-service.md",
260-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-update-azure-service",
261-
"redirect_document_id": false
262-
},
263-
{
264-
"source_path": "articles/cloud-services/cloud-services-workflow-process.md",
265-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-workflow-process",
266-
"redirect_document_id": false
267-
},
268-
{
269-
"source_path": "articles/cloud-services/diagnostics-extension-to-storage.md",
270-
"redirect_url": "/previous-versions/azure/cloud-services/diagnostics-extension-to-storage",
271-
"redirect_document_id": false
272-
},
273-
{
274-
"source_path": "articles/cloud-services/diagnostics-performance-counters.md",
275-
"redirect_url": "/previous-versions/azure/cloud-services/diagnostics-performance-counters",
276-
"redirect_document_id": false
277-
},
278-
{
279-
"source_path": "articles/cloud-services/mitigate-se.md",
280-
"redirect_url": "/previous-versions/azure/cloud-services/mitigate-se",
281-
"redirect_document_id": false
282-
},
283-
{
284-
"source_path": "articles/cloud-services/resource-health-for-cloud-services.md",
285-
"redirect_url": "/previous-versions/azure/cloud-services/resource-health-for-cloud-services",
286-
"redirect_document_id": false
287-
},
288-
{
289-
"source_path": "articles/cloud-services/schema-cscfg-file.md",
290-
"redirect_url": "/previous-versions/azure/cloud-services/schema-cscfg-file",
291-
"redirect_document_id": false
292-
},
293-
{
294-
"source_path": "articles/cloud-services/schema-cscfg-networkconfiguration.md",
295-
"redirect_url": "/previous-versions/azure/cloud-services/schema-cscfg-networkconfiguration",
296-
"redirect_document_id": false
297-
},
298-
{
299-
"source_path": "articles/cloud-services/schema-cscfg-role.md",
300-
"redirect_url": "/previous-versions/azure/cloud-services/schema-cscfg-role",
301-
"redirect_document_id": false
302-
},
303-
{
304-
"source_path": "articles/cloud-services/schema-csdef-file.md",
305-
"redirect_url": "/previous-versions/azure/cloud-services/schema-csdef-file",
306-
"redirect_document_id": false
307-
},
308-
{
309-
"source_path": "articles/cloud-services/schema-csdef-loadbalancerprobe.md",
310-
"redirect_url": "/previous-versions/azure/cloud-services/schema-csdef-loadbalancerprobe",
311-
"redirect_document_id": false
312-
},
313-
{
314-
"source_path": "articles/cloud-services/schema-csdef-networktrafficrules.md",
315-
"redirect_url": "/previous-versions/azure/cloud-services/schema-csdef-networktrafficrules",
316-
"redirect_document_id": false
317-
},
318-
{
319-
"source_path": "articles/cloud-services/schema-csdef-webrole.md",
320-
"redirect_url": "/previous-versions/azure/cloud-services/schema-csdef-webrole",
321-
"redirect_document_id": false
322-
},
323-
{
324-
"source_path": "articles/cloud-services/schema-csdef-workerrole.md",
325-
"redirect_url": "/previous-versions/azure/cloud-services/schema-csdef-workerrole",
326-
"redirect_document_id": false
327-
},
3283
{
3294
"source_path": "articles/automation/change-tracking/enable-from-portal.md",
3305
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",

0 commit comments

Comments
 (0)