Merge branch 'master' into aws-custom-resource-log-retention

mergify[bot] · web-flow · commit 71201db42d2b · 2020-03-12T13:39:17.000Z
diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts b/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts
@@ -42,6 +42,7 @@ export enum ComparisonOperator {
   GREATER_THAN_THRESHOLD = 'GreaterThanThreshold',
   LESS_THAN_THRESHOLD = 'LessThanThreshold',
   LESS_THAN_OR_EQUAL_TO_THRESHOLD = 'LessThanOrEqualToThreshold',
+  LESS_THAN_LOWER_OR_GREATER_THAN_UPPER_THRESHOLD = 'LessThanLowerOrGreaterThanUpperThreshold',
 }
 
 const OPERATOR_SYMBOLS: {[key: string]: string} = {
diff --git a/packages/@aws-cdk/aws-cloudwatch/package.json b/packages/@aws-cdk/aws-cloudwatch/package.json
@@ -131,6 +131,7 @@
       "docs-public-apis:@aws-cdk/aws-cloudwatch.ComparisonOperator.GREATER_THAN_THRESHOLD",
       "docs-public-apis:@aws-cdk/aws-cloudwatch.ComparisonOperator.LESS_THAN_THRESHOLD",
       "docs-public-apis:@aws-cdk/aws-cloudwatch.ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD",
+      "docs-public-apis:@aws-cdk/aws-cloudwatch.ComparisonOperator.LESS_THAN_LOWER_OR_GREATER_THAN_UPPER_THRESHOLD",
       "docs-public-apis:@aws-cdk/aws-cloudwatch.PeriodOverride",
       "docs-public-apis:@aws-cdk/aws-cloudwatch.PeriodOverride.AUTO",
       "docs-public-apis:@aws-cdk/aws-cloudwatch.PeriodOverride.INHERIT",

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ export enum ComparisonOperator {`
`42`	`42`	`GREATER_THAN_THRESHOLD = 'GreaterThanThreshold',`
`43`	`43`	`LESS_THAN_THRESHOLD = 'LessThanThreshold',`
`44`	`44`	`LESS_THAN_OR_EQUAL_TO_THRESHOLD = 'LessThanOrEqualToThreshold',`
	`45`	`+ LESS_THAN_LOWER_OR_GREATER_THAN_UPPER_THRESHOLD = 'LessThanLowerOrGreaterThanUpperThreshold',`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`const OPERATOR_SYMBOLS: {[key: string]: string} = {`