Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge recent changes on master to dev branch to resolve merge conflicts #11604

Merged
merged 1 commit into from
Nov 10, 2020
Merged

Merge recent changes on master to dev branch to resolve merge conflicts #11604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion custom-words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ aspnet
asyncinfo
asyncoperation
atascada
attestationcollateral
Auditd
australiaeast
australiasoutheast
Expand Down Expand Up @@ -760,6 +761,7 @@ Informations
Informix
Ingestor
ingressed
inittime
inkrecognizer
inlinecount
inlines
Expand Down Expand Up @@ -999,6 +1001,8 @@ Monospace
mountainview
MPNS
MRAN
mrenclave
mrsigner
MSAZR
MSAZRDE
MSCONCAT
Expand Down Expand Up @@ -1194,6 +1198,7 @@ Plex
Pohlmann
pois
policyassignments
policycertificates
policydefinitions
policyinsights
policykey
Expand Down Expand Up @@ -1310,6 +1315,8 @@ recoveryservicessiterecovery
recurse
rediscache
rediscachemanagement
RediSearch
redisenterprise
Redshift
Reenabled
Refid
Expand Down Expand Up @@ -1762,6 +1769,7 @@ Unregistering
Unregisters
unrestorable
unsubstituted
Unsynced
untagged
Untracked
unvalidated
Expand Down Expand Up @@ -2015,4 +2023,10 @@ Conntrack
inotify
Inotify
swappiness
Swappiness
Swappiness
unarchive
unarchiving
ssoadfs
Idempotence
Sqlpools
privatelinkhub