Skip to content

Commit c1e2cd8

Browse files
committed
1783001, fixed merge conflicts.
2 parents df57a0d + c602be7 commit c1e2cd8

152 files changed

Lines changed: 1119 additions & 917 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41180,6 +41180,11 @@
4118041180
"redirect_url": "/previous-versions/sql/2014/tutorials/using-drillthrough-on-structure-data-basic-data-mining-tutorial",
4118141181
"redirect_document_id": false
4118241182
},
41183+
{
41184+
"source_path": "docs/big-data-cluster/cluster-troubleshoot-overview.md",
41185+
"redirect_url": "/sql/big-data-cluster/view-cluster-status#big-data-clusters-troubleshooting-resources",
41186+
"redirect_document_id": true
41187+
},
4118341188
{
4118441189
"source_path": "docs/relational-databases/polybase/data-virtualization-csv.md",
4118541190
"redirect_url": "/sql/big-data-cluster/data-virtualization-csv",
@@ -46195,11 +46200,6 @@
4619546200
"redirect_url": "/sql/integration-services/scale-out/integration-services-ssis-scale-out",
4619646201
"redirect_document_id": true
4619746202
},
46198-
{
46199-
"source_path": "docs/ssdt/sql-server-tools.md",
46200-
"redirect_url": "/sql/tools/overview-sql-tools",
46201-
"redirect_document_id": false
46202-
},
4620346203
{
4620446204
"source_path": "docs/integration-services/data-flow/transformations/cache-connection-manager.md",
4620546205
"redirect_url": "/sql/integration-services/connection-manager/cache-connection-manager",

docs/azdata/reference/reference-azdata-app-template.md

Lines changed: 1 addition & 1 deletion

docs/azdata/reference/reference-azdata-app.md

Lines changed: 1 addition & 1 deletion

docs/azdata/reference/reference-azdata-arc-dc-config.md

Lines changed: 1 addition & 1 deletion

docs/azdata/reference/reference-azdata-arc-dc-debug.md

Lines changed: 1 addition & 1 deletion

docs/azdata/reference/reference-azdata-arc-dc-endpoint.md

Lines changed: 1 addition & 1 deletion

docs/azdata/reference/reference-azdata-arc-dc-status.md

Lines changed: 1 addition & 1 deletion

docs/azdata/reference/reference-azdata-arc-dc.md

Lines changed: 1 addition & 1 deletion

docs/azdata/reference/reference-azdata-arc-postgres-backup.md

Lines changed: 1 addition & 1 deletion

docs/azdata/reference/reference-azdata-arc-postgres-endpoint.md

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)