Skip to content

Commit 97ecbc4

Browse files
authored
Merge pull request #58102 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents e8c383b + 41c3797 commit 97ecbc4

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

articles/aks/autoscaler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ subjects:
228228
namespace: kube-system
229229
230230
---
231-
apiVersion: extensions/v1
231+
apiVersion: apps/v1
232232
kind: Deployment
233233
metadata:
234234
labels:

articles/billing/billing-partner-admin-link-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Join the discussion in the [Microsoft Partner Community](https://aka.ms/PALdiscu
119119

120120
**Who can link the partner ID?**
121121

122-
Any user from the partner organization who is managing customer's resource can link the partner ID to the account.
122+
Any user from the partner organization who is managing customer's Azure resources can link the partner ID to the account.
123123

124124
**Once a partner ID is linked can it be changed?**
125125

articles/data-explorer/python-ingest-data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ dataframe_from_result_table(RESPONSE.primary_results[0])
158158
Sign in to [https://dataexplorer.azure.com](https://dataexplorer.azure.com) and connect to your cluster. Run the following command in your database to see if there were any ingestion failures in the last four hours. Replace the database name before running.
159159

160160
```Kusto
161-
.show ingestion failures
162-
| where FailedOn > ago(4h) and Database == "<DatabaseName>"
161+
.show ingestion failures
162+
| where FailedOn > ago(4h) and Database == "<DatabaseName>"
163163
```
164164

165165
Run the following command to view the status of all ingestion operations in the last four hours. Replace the database name before running.

articles/sql-database/sql-database-managed-instance-transact-sql-information.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ The following variables, functions, and views return different results:
421421

422422
Each Managed Instance has up to 35 TB storage reserved for Azure Premium Disk space, and each database file is placed on a separate physical disk. Disk sizes can be 128 GB, 256 GB, 512 GB, 1 TB, or 4 TB. Unused space on disk is not charged, but the total sum of Azure Premium Disk sizes cannot exceed 35 TB. In some cases, a Managed Instance that does not need 8 TB in total might exceed the 35 TB Azure limit on storage size, due to internal fragmentation.
423423

424-
For example, a Managed Instance could have one file 1.2 TB in size that is placed on a 4 TB disk, and 248 files each 1 GB ins size that are placed on separate 128 GB disks. In this example:
424+
For example, a Managed Instance could have one file 1.2 TB in size that is placed on a 4 TB disk, and 248 files each 1 GB in size that are placed on separate 128 GB disks. In this example:
425425

426426
- the total disk storage size is 1 x 4 TB + 248 x 128 GB = 35 TB.
427427
- the total reserved space for databases on the instance is 1 x 1.2 TB + 248 x 1 GB = 1.4 TB.

0 commit comments

Comments
 (0)