Skip to content

Commit 543bb52

Browse files
authored
Merge branch 'main' into ml-grafanasku
2 parents 864ee2b + a6f37a4 commit 543bb52

File tree

16,795 files changed

+99042
-796998
lines changed

Some content is hidden

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

16,795 files changed

+99042
-796998
lines changed

.openpublishing.publish.config.json

Lines changed: 58 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,18 @@
7474
"branch": "master",
7575
"branch_mapping": {}
7676
},
77+
{
78+
"path_to_root": "ms-identity-docs-code-dotnet",
79+
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-dotnet",
80+
"branch": "main",
81+
"branch_mapping": {}
82+
},
83+
{
84+
"path_to_root": "ms-identity-javascript-react-docs",
85+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-react-docs",
86+
"branch": "main",
87+
"branch_mapping": {}
88+
},
7789
{
7890
"path_to_root": "ms-identity-docs-code-javascript",
7991
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-javascript",
@@ -86,6 +98,48 @@
8698
"branch": "main",
8799
"branch_mapping": {}
88100
},
101+
{
102+
"path_to_root": "ms-identity-javascript-v2",
103+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-v2",
104+
"branch": "master",
105+
"branch_mapping": {}
106+
},
107+
{
108+
"path_to_root": "ms-identity-python-webapp-quickstart",
109+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
110+
"branch": "0.7.0",
111+
"branch_mapping": {}
112+
},
113+
{
114+
"path_to_root": "ms-identity-python-webapp-tutorial",
115+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
116+
"branch": "0.6.0",
117+
"branch_mapping": {}
118+
},
119+
{
120+
"path_to_root": "ms-identity-node",
121+
"url": "https://github.com/Azure-Samples/ms-identity-node",
122+
"branch": "main",
123+
"branch_mapping": {}
124+
},
125+
{
126+
"path_to_root": "ms-identity-javascript-nodejs-desktop",
127+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
128+
"branch": "main",
129+
"branch_mapping": {}
130+
},
131+
{
132+
"path_to_root": "ms-identity-b2c-javascript-spa",
133+
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
134+
"branch": "main",
135+
"branch_mapping": {}
136+
},
137+
{
138+
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
139+
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
140+
"branch": "master",
141+
"branch_mapping": {}
142+
},
89143
{
90144
"path_to_root": "_themes",
91145
"url": "https://github.com/Microsoft/templates.docs.msft",
@@ -404,12 +458,6 @@
404458
"branch": "master",
405459
"branch_mapping": {}
406460
},
407-
{
408-
"path_to_root": "ms-identity-docs-code-dotnet",
409-
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-dotnet",
410-
"branch": "main",
411-
"branch_mapping": {}
412-
},
413461
{
414462
"path_to_root": "remote-monitoring-webui",
415463
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -764,12 +812,6 @@
764812
"branch": "master",
765813
"branch_mapping": {}
766814
},
767-
{
768-
"path_to_root": "ms-identity-javascript-react-docs",
769-
"url": "https://github.com/Azure-Samples/ms-identity-javascript-react-docs",
770-
"branch": "main",
771-
"branch_mapping": {}
772-
},
773815
{
774816
"path_to_root": "cognitive-services-quickstart-code",
775817
"url": "https://github.com/Azure-Samples/cognitive-services-quickstart-code",
@@ -884,24 +926,6 @@
884926
"branch": "master",
885927
"branch_mapping": {}
886928
},
887-
{
888-
"path_to_root": "ms-identity-b2c-javascript-spa",
889-
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
890-
"branch": "main",
891-
"branch_mapping": {}
892-
},
893-
{
894-
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
895-
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
896-
"branch": "master",
897-
"branch_mapping": {}
898-
},
899-
{
900-
"path_to_root": "ms-identity-javascript-v2",
901-
"url": "https://github.com/Azure-Samples/ms-identity-javascript-v2",
902-
"branch": "master",
903-
"branch_mapping": {}
904-
},
905929
{
906930
"path_to_root": "msdocs-python-flask-webapp-quickstart",
907931
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -957,32 +981,14 @@
957981
"branch_mapping": {}
958982
},
959983
{
960-
"path_to_root": "ms-identity-python-webapp-quickstart",
961-
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
962-
"branch": "0.7.0",
963-
"branch_mapping": {}
964-
},
965-
{
966-
"path_to_root": "ms-identity-python-webapp-tutorial",
967-
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
968-
"branch": "0.6.0",
969-
"branch_mapping": {}
970-
},
971-
{
972-
"path_to_root": "ms-identity-node",
973-
"url": "https://github.com/Azure-Samples/ms-identity-node",
974-
"branch": "main",
975-
"branch_mapping": {}
976-
},
977-
{
978-
"path_to_root": "ms-identity-javascript-nodejs-desktop",
979-
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
984+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
985+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
980986
"branch": "main",
981987
"branch_mapping": {}
982988
},
983989
{
984-
"path_to_root": "cosmos-db-nosql-dotnet-samples",
985-
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
990+
"path_to_root": "cosmos-db-nosql-dotnet-quickstart",
991+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-quickstart",
986992
"branch": "main",
987993
"branch_mapping": {}
988994
},
@@ -1196,7 +1202,6 @@
11961202
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
11971203
"articles/azure-relay/.openpublishing.redirection.relay.json",
11981204
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
1199-
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
12001205
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
12011206
"articles/communication-services/.openpublishing.redirection.communication-services.json",
12021207
"articles/communications-gateway/.openpublishing.redirection.communications-gateway.json",

0 commit comments

Comments
 (0)