Skip to content

Commit f756c9b

Browse files
committed
fixing merge conflict
2 parents 439e471 + c60c423 commit f756c9b

File tree

474 files changed

+4994
-3728
lines changed

Some content is hidden

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

474 files changed

+4994
-3728
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,21 @@
4040
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
4141
"redirect_document_id": false
4242
},
43+
{
44+
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
45+
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/active-directory/governance/tutorial-offboard-custom-workflow-graph.md",
50+
"redirect_url": "/graph/tutorial-lifecycle-workflows-offboard-custom-workflow",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/active-directory/governance/tutorial-scheduled-leaver-graph.md",
55+
"redirect_url": "/graph/tutorial-lifecycle-workflows-scheduled-leaver",
56+
"redirect_document_id": false
57+
},
4358
{
4459
"source_path_from_root": "/articles/active-directory/governance/set-employee-leave-date-time.md",
4560
"redirect_url": "/graph/tutorial-lifecycle-workflows-set-employeeleavedatetime",
@@ -50,6 +65,16 @@
5065
"redirect_url": "/azure/active-directory/saas-apps/navex-irm-keylight-lockpath-tutorial",
5166
"redirect_document_id": false
5267
},
68+
{
69+
"source_path_from_root": "/articles/active-directory/saas-apps/headerf5-tutorial.md",
70+
"redirect_url": "/azure/active-directory/saas-apps/f5-big-ip-headers-easy-button",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/active-directory/saas-apps/oracle-peoplesoft-protected-by-f5-big-ip-apm-tutorial.md",
75+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
76+
"redirect_document_id": false
77+
},
5378
{
5479
"source_path_from_root": "/articles/active-directory/fundamentals/whats-new-microsoft-365-government.md",
5580
"redirect_url": "/azure/active-directory/fundamentals/whats-new",

.openpublishing.redirection.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -763,11 +763,6 @@
763763
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
764764
"redirect_document_id": false
765765
},
766-
{
767-
"source_path_from_root": "/articles/aks/node-access.md",
768-
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
769-
"redirect_document_id": false
770-
},
771766
{
772767
"source_path_from_root": "/articles/aks/troubleshooting.md",
773768
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",

articles/active-directory/app-provisioning/export-import-provisioning-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.topic: how-to
1010
ms.workload: identity
11-
ms.date: 05/11/2021
11+
ms.date: 10/20/2022
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---

articles/active-directory/app-provisioning/expression-builder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.topic: conceptual
1010
ms.workload: identity
11-
ms.date: 06/02/2021
11+
ms.date: 10/20/2022
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---

articles/active-directory/app-provisioning/functions-for-customizing-application-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: active-directory
77
ms.subservice: app-provisioning
88
ms.workload: identity
99
ms.topic: reference
10-
ms.date: 04/13/2022
10+
ms.date: 10/20/2022
1111
ms.author: kenwith
1212
ms.reviewer: arvinh
1313
---

articles/active-directory/app-provisioning/how-provisioning-works.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.topic: conceptual
1010
ms.workload: identity
11-
ms.date: 02/03/2022
11+
ms.date: 10/20/2022
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---

articles/active-directory/app-provisioning/hr-attribute-retrieval-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: active-directory
77
ms.subservice: app-provisioning
88
ms.topic: troubleshooting
99
ms.workload: identity
10-
ms.date: 10/27/2021
10+
ms.date: 10/20/2022
1111
ms.author: kenwith
1212
ms.reviewer: chmutali
1313
---

articles/active-directory/app-provisioning/hr-manager-update-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: active-directory
77
ms.subservice: app-provisioning
88
ms.topic: troubleshooting
99
ms.workload: identity
10-
ms.date: 10/27/2021
10+
ms.date: 10/20/2022
1111
ms.author: kenwith
1212
ms.reviewer: chmutali
1313
---

articles/active-directory/app-provisioning/hr-user-creation-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: active-directory
77
ms.subservice: app-provisioning
88
ms.topic: troubleshooting
99
ms.workload: identity
10-
ms.date: 10/27/2021
10+
ms.date: 10/20/2022
1111
ms.author: kenwith
1212
ms.reviewer: chmutali
1313
---

articles/active-directory/app-provisioning/hr-user-update-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: active-directory
77
ms.subservice: app-provisioning
88
ms.topic: troubleshooting
99
ms.workload: identity
10-
ms.date: 10/27/2021
10+
ms.date: 10/20/2022
1111
ms.author: kenwith
1212
ms.reviewer: chmutali
1313
---

0 commit comments

Comments
 (0)