From 93a9ba1dbcaa027d0778e4491c2e506523be936b Mon Sep 17 00:00:00 2001 From: Maulik003 Date: Sat, 1 Oct 2022 16:13:57 -0700 Subject: [PATCH] Resolved merge conflict of cutsom-words.txt (#20956) * Resolved merge conflict * Resolved merge conflict Co-authored-by: maulikjoshi --- custom-words.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/custom-words.txt b/custom-words.txt index bc0c9d717454..258ce8a3bde3 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2743,7 +2743,24 @@ smallrc Autotune Showmount autogrid +remediatable KubeProxyConfig IPVS TCPFIN taginheritance +questionanswers +Satya +Nadella +Telangana +servicehealth +metricstaticthreshold +metricsdynamicthreshold +logalert +logalertv2 +smartalert +webtestalert +logalertv1numresult +logalertv1metricmeasurement +resourcehealth +activitylog +budget