Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c1e7723

Browse files
TimShererWithAquentTimShererWithAquent
committedSep 25, 2020
Resolve conflicts.
2 parents b4384ab + 3f779f3 commit c1e7723

File tree

6,457 files changed

+103801
-39857
lines changed

Some content is hidden

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

6,457 files changed

+103801
-39857
lines changed
 

‎.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,11 @@
403403
"url": "https://github.com/Azure-Samples/azure-spring-data-cosmos-java-sql-api-getting-started/",
404404
"branch": "main"
405405
},
406+
{
407+
"path_to_root": "azure-cosmos-spark",
408+
"url": "https://github.com/Azure/azure-cosmosdb-spark",
409+
"branch": "2.4"
410+
},
406411
{
407412
"path_to_root": "cosmos-dotnet-getting-started",
408413
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",

‎.openpublishing.redirection.json

Lines changed: 791 additions & 106 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)