From 574ef32aaf982814f0de4bbf55122a9651bb5c08 Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Tue, 7 Nov 2023 10:47:09 +0800 Subject: [PATCH] resolve conflict --- custom-words.txt | 268 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 204 insertions(+), 64 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index 39c3c357d611..39c68df1eba8 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -31,6 +31,7 @@ acrapi acss acssbackup acssbackups +actiongroups actionplans activedirectory activitylog @@ -39,6 +40,7 @@ actualcost actualcostbudget actuals actuser +Adabas adal adamw addins @@ -51,12 +53,15 @@ adfs adhoc adhybridhealthservice adla +adlarge adls adlsgen adminmanagement +adou adsis adto adultscore +adxlarge afd afdx affinitized @@ -69,9 +74,10 @@ agri ahub ai aiapi -aitoolchainoperator +aitl akamai aksendpoint +alarge alertfeedback alertrule alertrules @@ -80,14 +86,18 @@ alertstate alexa algo alibaba +alicesprings allofany allowlist alon amazonservices ambari ambr -amf +amedium +ametal +amf amfs +amicro amlcompute amortizedcost analysisservices @@ -95,7 +105,9 @@ analyticsconnectors analyticsstorage analyzeconversations analyzetext +anano and'ed +anded angika annotatable anomalydetector @@ -107,14 +119,12 @@ antimeridian antispam anybuild anyofany -aoai aoairesource aods aosm apac apacheavro api's -apigee apim apimanagement apimapis @@ -170,7 +180,6 @@ appendpos appfigures appid appinsights -Applicationkey applynetworkconfigurationupdates appservice appsettings @@ -194,6 +203,7 @@ artifacturi asana asciifolding ascs +asmall asns aspnet assessmentprojects @@ -214,6 +224,7 @@ australiacentral australiaeast australiasoutheast authenticatable +authenticationsettings authenticode authkey authorizationrules @@ -255,8 +266,10 @@ autotune avro avrodeflate awadhi +axlarge azcis azcmagent +azedge azext azfw azns @@ -278,6 +291,7 @@ azuredatalakestore azuredatatransferrp azuredeploy azureedge +azurefile azurefiles azurehdinsight azureiotcentral @@ -352,6 +366,7 @@ bitness bitrates bitstream biztalk +blarge blobfuse blobservices blobstorage @@ -364,6 +379,7 @@ blocklisttype bluefield bmci bmcip +bmetal bmsaad bmspo bmsrp @@ -392,6 +408,7 @@ bundeli burstable businessmetadata buslogic +bxlarge byoa byoc byok @@ -417,12 +434,14 @@ caverphone cavlc cbcs ccyymmdd +cdie cenc centralindia centralus centraluseuap +ceph +cephfs certchain -certificateprofiles certificatescreateorupdate certificatesdelete certificatethumbprint @@ -457,6 +476,7 @@ clickthrough clientaccesspolicy clienterror clientgroup +clientids clientlib clientmetric clinicaltrials @@ -491,6 +511,7 @@ cmkdw cmkhs cmmi cmwis +cnab cname cnames cni @@ -501,14 +522,9 @@ codemirror codepackage codespace codespaces -codesign -codesigning -codesigningaccounts -Code coffeelake cognitiveservices collectiondetails -cogservice colls colocation cololocation @@ -516,6 +532,7 @@ columnstore commandshistory commitmentplans commoncrypto +commscope compat compilationjobs compilefile @@ -526,11 +543,11 @@ conda configreferences configurationgroups confluent +conhash connectionstrings conntrack consistencygroup consumergroups -containerd containerid containerinstance containerlogs @@ -545,7 +562,6 @@ continuationtoken continuousdataexports continuouswebjobs contoso -Contoso's contosodataset contosomedia contributer @@ -562,6 +578,7 @@ cosmosdb costcenter costinsights costmanagement +coterm couchbase cpes cpim @@ -574,7 +591,6 @@ createorupdate createpreview credativ creds -criterias crossdomain cscf cscfg @@ -595,9 +611,10 @@ customhostname customimages customimagesearch customizability +customizationgroups +customizationtasks customizer custommpi -customermanagedkeys customprebuiltdomains customprebuiltentities customprebuiltintents @@ -642,7 +659,6 @@ datalake datalakeanalytics datalakestore datamanagement -datamap datamasking datamigration datamodel @@ -650,7 +666,6 @@ datapath dataplane datapoint datapoints -datareferences datas dataschema dataset @@ -689,6 +704,8 @@ deallocates deallocating deallocation deboards +Deboard +deboard debugsend decisionrule decodable @@ -699,7 +716,9 @@ deduping deduplication defanged defrag +deid deinterlace +Deinterlace deinterlacing deletable deleteconsumergroup @@ -751,6 +770,8 @@ devicetags devicetemplates deviceupdate devops +devpay +Devpay devspaces devtestlab devtestlabs @@ -766,6 +787,7 @@ digitaltwins dimm directline disableautoscale +Disabledkmskey disablescheduling disambiguated discoverability @@ -776,15 +798,21 @@ distcp distinguisher distributeversioner distro +dlarge dmarc +dmetal +dmqtt dmts dnai dnat +dnlarge +dnmetal dnn dnskey dnsname dnssec dnszones +dnxlarge dockerfile dockerfiles docm @@ -795,11 +823,13 @@ domainname domainservices domexception dotall +dotnetcore dotnetspark dpdk dpis dras drms +drtm dryrun dryruns dscm @@ -815,6 +845,7 @@ DTMI dtus duration'pt dwgzippackage +dxlarge dynamicpersongroups dynatrace eapmscha @@ -832,6 +863,11 @@ edgenodes edifact edittables edmx +EFSIO +Efsioerror +Efsmountconnectivityerror +Efsmountfailure +Efsmounttimeout einsteinweg eirp eirpd @@ -852,10 +888,11 @@ endoftext endpointkeys endpointname endswith -Entra endtime enein engagementfabric +Enilimitexceeded +enmetal enquoted enrollmentgroups entitydef @@ -863,7 +900,9 @@ entitysearch entrypoint enumdef environmentsettings +enxlarge epsg +EPYC erasureordestructionlog errordetail errored @@ -873,7 +912,6 @@ español esrp esrps estaba -esxi etag etags etcd @@ -900,6 +938,7 @@ ewdg exceptiontype exfiltrate exfiltration +exlarge experimentids expiresin explainability @@ -965,9 +1004,9 @@ findsimilars findsquare finetune finetunes -finetuning firmwares -flac +fiveg +fiveqi flexera flink flowlet @@ -988,7 +1027,6 @@ francecentral francesouth freebsd freeflow -freemium frontdoor frulian fsaction @@ -997,6 +1035,7 @@ fullmetadata fulltext fullyqualified functionappsettings +Functionerror gagauz galician galleryimage @@ -1007,7 +1046,11 @@ gbps gc'd gcch gcmaes +gdlarge +gdmedium +gdmetal gdpr +gdxlarge genderless generatelivetoken generatesastoken @@ -1015,6 +1058,9 @@ generateverificationcode generateverificationcodex generatevpnclientpackage generatevpnprofile +genlarge +genmedium +genxlarge geobias geocode geocoded @@ -1046,6 +1092,7 @@ getissuers getjob getkey getmaptile +getporter getprivateendpointconnection getprivatelinkresources getrotationpolicy @@ -1063,17 +1110,24 @@ gilbertese githuboauth githubusercontent gitrepo -gitrepo givenname +glarge globalconfiguration globby gloo gltf gluster glusterfs +gmedium +gmetal +gmicro gmsa +gnano gnb gnbs +gnlarge +gnmedium +gnxlarge goarch gomodule gondor @@ -1089,7 +1143,6 @@ granularities graphrbac graphservice greenplum -groundedness groundstation groupby groupedby @@ -1097,6 +1150,7 @@ grpc gsaascend gsamas gshut +gsmall gsmt gtfs gtid @@ -1107,6 +1161,7 @@ guid guids gurung guti +gxlarge gzrs haag haase @@ -1157,6 +1212,7 @@ hivevar hkey hnsonmigration hnsw +homee homepagetest horovod hostnames @@ -1169,6 +1225,7 @@ hsla hsms hubspot hugepages +hvci hybridaks hybridconnection hybriddata @@ -1185,6 +1242,7 @@ iaasvm iaasvmcontainer iana iata +IBMAIX icann icao iccid @@ -1192,23 +1250,38 @@ icelake icmp idempotence idempotency +idlarge +idmetal +idnlarge +idnmetal idns +idnxlarge idps idrg +idxlarge +iedn +iednmetal +iednxlarge +iezn +ieznmetal iidt iisaks ikev +ilarge ilearner illumos iloveyou +Imageaccessdenied imageanalysis imagebuilder -imagecomposition +Imagedeleted imagelist imagelists imagesearch imds imei +imeisv +imetal immutabilitypolicy importances importcollectors @@ -1216,10 +1289,10 @@ importdevices imsi inari inbuild -inclusivity incomingrelationships incrementalcopy indic +infa inferencing informatica informaticaproperties @@ -1231,18 +1304,23 @@ ingressgateway initialiazing inittime inkrecognizer +inlarge inlinecount inlines +inmetal innererror inotify inprogress installable installableupdates +Instancestore +Insufficientrolepermissions integrationaccount integrationruntimes intelli interactivequery interdomain +Internalerror interoperated intervaled interventional @@ -1250,8 +1328,17 @@ interworking intraorg intset intune +intunewin intvl invalidarg +Invalidconfiguration +Invalidimage +Invalidruntime +Invalidsecuritygroup +Invalidstatekmskey +Invalidsubnet +Invalidzipfileexception +inxlarge iojs iops iosmam @@ -1271,6 +1358,7 @@ ipconfigurations ipfilterrules ipfix ipgroups +Ipname ipos ipsec ipsettings @@ -1296,6 +1384,7 @@ isusernameavailable isvs items itsm +ixlarge janedoe japaneast japanwest @@ -1329,7 +1418,6 @@ kafkarest kaliningrad kangri karachay -karpenter kashubian kata kbid @@ -1346,6 +1434,8 @@ keyspace keyspaces keystore keytab +Keycloak +keycloak keyvault keyvaultproperties keyvaulturi @@ -1355,7 +1445,10 @@ khtml kibana kiswahili kleur +kmgtpe kmph +Kmskeyaccessdenied +Kmskeynotfound knowledgebase knowledgebases koelner @@ -1396,6 +1489,7 @@ labaccounts labelset labservices lajolla +lakehouse languagedata largefacelists largepersongroups @@ -1410,11 +1504,11 @@ ldom leadgen leavingpool leds +Legacybios legalhold lfot lhcp libgit -libgit2 libtrust lifecycle lifecycles @@ -1450,12 +1544,14 @@ liveevent liveoutput llap lldp +lmhost lmhostid lminimal loadbalancer loadtest loadtests loadtestservice +localbroker localbusinesses localcategories localcircularview @@ -1507,8 +1603,8 @@ machinelearningcompute machinelearningexperimentation machinelearningservices machinewithhints +macroe macvlan -madma madvise magadan magento @@ -1596,7 +1692,6 @@ metricsadvisor metricsdynamicthreshold metricstaticthreshold metrictype -mgid mgmt mhsm mhsmip @@ -1626,7 +1721,10 @@ mlflowtrackinguri mltable mmtc mnist -Modbus +mobo +mobobroker +mobobrokers +modbus modelmanagement modifiedtime modifyaclentries @@ -1640,7 +1738,6 @@ moodle mooncake mountainview movere -mpga mpls mpns mran @@ -1657,7 +1754,7 @@ msdb msgetaclstatus msgetfilestatus mshv -msisdn +msisdn msix msixpackage msixpackages @@ -1681,6 +1778,7 @@ multiregion multiset multislot multispeaker +multistat multistep multisubnet multivalued @@ -1721,12 +1819,12 @@ nameserver nameservers namespace's namespaceinfo -namf +namf nanoserver napt narrowband natgateway -nausf +nausf nbformat nccl nchar @@ -1746,7 +1844,6 @@ networkacls networkinterfaces networkruleset networkrulesets -networksecurityperimeter networksettings networkstatus networktraversal @@ -1765,21 +1862,23 @@ ngap ngfw nginx ngmlc -ngmlc ngran nics nillable nist niuean -nlmf +nlarge +nlmf nlstext nmae -nnrf -nnssf +nmetal +nnrf +nnssf noaccess noaction noaddressprefixes noartifactsource +nochange nocopy nodeagentskus nodeconfiguration @@ -1812,36 +1911,41 @@ notstarted notstrict nouploadcache nowcasts -npcf +npcf npipe npmrc nrf nrfs nrmse nsdname +nsdv nsgs nsku -nsmf -nsmsf +nsmf +nsmsf +nsptest +nsptestclient +nsptestpaasrp +nsptests nssai -nssai -nssais +nssais nssf -nssf nsxt ntext ntfs ntlm -nudm +nudm numa numactl numastat +numk numofmessages numrecords nvarchar nvme nwfs nxdomain +nxlarge nynorsk nysiis oaep @@ -1975,10 +2079,9 @@ personalizer persongroups petabit pfcp -pfd +pfd pfds pfsmm -pfsmm phonetik phplogging phpworkloads @@ -1993,8 +2096,6 @@ piqd pitr pixelated pkcs -planogram -planogramcompliance pkis playready plex @@ -2019,6 +2120,7 @@ polyline polynomially poolusagemetrics popreceipt +populator portalconfigs portalsettings posession @@ -2032,6 +2134,7 @@ powerbidedicated powerbiembedded poweredoff poweroff +PPRD ppsx pptm pptp @@ -2074,12 +2177,11 @@ privatelinks privatelinkscopes privatelinkservice privatepreview -productrecognition projecthilo propagations propogation protectable -protobuf +Providedal providerhub providerport provisioner @@ -2092,6 +2194,7 @@ pswd ptrdname publicipaddresses publicpreview +Publishedversions publishingcredentials publishsettings publishxml @@ -2138,6 +2241,7 @@ quotastatus racyscore ragrs ragzrs +ramdisk randint rangelist rankable @@ -2213,7 +2317,6 @@ removeaclentries removedefaultacl removenodes removex -reoffer reparent replicationdetails replicationstatus @@ -2282,17 +2385,17 @@ rgbrgb rgname rhcp rhel +riskreputation rmem rmpl rmse rolledback rollforward -Rollingback +rollingback rollouts rolloverdetails rollupby rootfs -rootcert rosettanetprocessconfigurations rotatediskencryptionkey rotationpolicy @@ -2337,7 +2440,7 @@ rwxrw saas saau sadri -saegw +saegw safenet safeuint sahamati @@ -2347,6 +2450,8 @@ salinuxvm sami saml santali +SAPASE +SAPDB sapsrv saql saskey @@ -2371,11 +2476,13 @@ schemagroups scim scms scom +scomgateways +scomgateway scopemap scsv scvmm +sddc sddl -sdflex sdks sdwan searchbuffer @@ -2411,6 +2518,7 @@ serverfarm serverfarms serverless serverlevel +serviceaccount servicebus servicebusqueue servicebustopic @@ -2461,6 +2569,8 @@ showall showback showmount showonly +Shuttingdown +signaldefinitions signalr signin signup @@ -2481,6 +2591,7 @@ skolt sku sku's skus +Skytap sles sllb slotcopy @@ -2535,9 +2646,9 @@ spearman's specversion speechservicesmanagement speechtotext +spiffe splitallcsvs spreadsheetml -springboot sqlag sqldatabase sqldb @@ -2553,6 +2664,8 @@ sqlvms sqoop sriov ssdzrs +ssid +ssids ssis ssisdb ssoadfs @@ -2570,6 +2683,7 @@ starttaskfailed starttime stateful statefulset +statefulsets stateset statesets statetile @@ -2621,6 +2735,7 @@ subnames subnet subnet's subnetname +Subnetoutofipaddresses subnetpool subnets suboperation @@ -2656,14 +2771,17 @@ supporttickets susbcriptionid suvp svgs +svid svpn swappable swappiness swapslots swedensouth +switchless switchprotection switzerlandnorth switzerlandwest +sxlarge sybase synapselink syncer @@ -2718,7 +2836,6 @@ termtemplatedef testall testallroutes testbase -testconnection testfailover testnew testnewroute @@ -2740,6 +2857,7 @@ tileset tilesetconfiguration tilesets timeasc +timechart timedesc timedout timeframe @@ -2758,14 +2876,18 @@ tlsa tlsciphers tlsprotocols tmpfs +tmsi +tngf tnla tokenizes +tolerations tombstoned toolchain toolset tooltips topqueries topquery +totalCPUMHz tpeg tpgs tpm @@ -2811,6 +2933,7 @@ ueba uecm uecu uefi +Uefipreferred uint uknorth uksouth @@ -2821,7 +2944,6 @@ unarchive unassign unassignment unassigns -unassigning unattend unbilled unclaim @@ -2904,6 +3026,7 @@ upserting urllc usagescenarios useast +usedCPUMHz useraccount userargs userassignedidentities @@ -2943,6 +3066,7 @@ vcsa vectorize vectorizer verifyx +versioner versionid versionswithin vertica @@ -2982,6 +3106,7 @@ vmilr vmimage vmimages vmip +vmmservers vmname vmos vmotion @@ -3023,6 +3148,7 @@ vxlan w3clogfile waagent wadl +wagf waitforjobcompletion waitingforkvaio waitingforstarttask @@ -3042,11 +3168,13 @@ wayfind wayfinding waypoint waypoints +wdac wdatp webapicontainer webapplicationfirewall webapps webchat +WEBDISP webhdfs webhook webhooks @@ -3081,6 +3209,7 @@ wifi windingness windowsazuremediaservices windowsesu +winget wlan wlmengg wmem @@ -3109,6 +3238,7 @@ xml xsmb xstr xvcj +xvdh yazaki yolo yucatec @@ -3121,6 +3251,9 @@ zhuang zilla zipdeploy ziplist +znlarge +znmetal +znxlarge zoho zoneinfo zset @@ -3736,12 +3869,19 @@ usedCPUMHz totalCPUMHz docon DialOut +Vectorizable vectorizers Entra +virtualendpoints +switchover +SwitchOver +Switchover CapacityReservationGroup CapacityReservationGroups +Paas +PAAS +ciem capacityreservationgroup capacityreservationgroups - -Paas -PAAS \ No newline at end of file +ciam +CIAM