chore: fix build by conflict introduced with parallel PRs (#2992)

`new InstanceTypePair` was renamed to `InstanceType.of`.
aws · Jun 21, 2019 · b662188 · b662188
1 parent 9101161
commit b662188
Show file tree

Hide file tree

Showing 86 changed files with 90 additions and 90 deletions.
diff --git a/packages/@aws-cdk/alexa-ask/package.json b/packages/@aws-cdk/alexa-ask/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/app-delivery/package.json b/packages/@aws-cdk/app-delivery/package.json
@@ -83,4 +83,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/assets/package.json b/packages/@aws-cdk/assets/package.json
@@ -88,4 +88,4 @@
     "minimatch"
   ],
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-amazonmq/package.json b/packages/@aws-cdk/aws-amazonmq/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-amplify/package.json b/packages/@aws-cdk/aws-amplify/package.json
@@ -80,4 +80,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-appmesh/package.json b/packages/@aws-cdk/aws-appmesh/package.json
@@ -80,4 +80,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-appstream/package.json b/packages/@aws-cdk/aws-appstream/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-appsync/package.json b/packages/@aws-cdk/aws-appsync/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-athena/package.json b/packages/@aws-cdk/aws-athena/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-autoscaling-common/package.json b/packages/@aws-cdk/aws-autoscaling-common/package.json
@@ -75,4 +75,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json b/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json
@@ -99,4 +99,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-autoscaling/README.md b/packages/@aws-cdk/aws-autoscaling/README.md
@@ -30,7 +30,7 @@ import ec2 = require('@aws-cdk/aws-ec2');
 
 new autoscaling.AutoScalingGroup(this, 'ASG', {
     vpc,
-    instanceType: new ec2.InstanceTypePair(InstanceClass.Burstable2, InstanceSize.Micro),
+    instanceType: ec2.InstanceType.of(InstanceClass.Burstable2, InstanceSize.Micro),
     machineImage: new ec2.AmazonLinuxImage() // get the latest Amazon Linux image
 });
 ```

diff --git a/packages/@aws-cdk/aws-autoscalingplans/package.json b/packages/@aws-cdk/aws-autoscalingplans/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-batch/package.json b/packages/@aws-cdk/aws-batch/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-budgets/package.json b/packages/@aws-cdk/aws-budgets/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-cloud9/package.json b/packages/@aws-cdk/aws-cloud9/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-cloudfront/package.json b/packages/@aws-cdk/aws-cloudfront/package.json
@@ -91,4 +91,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/package.json b/packages/@aws-cdk/aws-cloudwatch-actions/package.json
@@ -97,4 +97,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-codecommit/package.json b/packages/@aws-cdk/aws-codecommit/package.json
@@ -91,4 +91,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-codepipeline-actions/package.json b/packages/@aws-cdk/aws-codepipeline-actions/package.json
@@ -111,4 +111,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-codepipeline/package.json b/packages/@aws-cdk/aws-codepipeline/package.json
@@ -104,4 +104,4 @@
     ]
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-datapipeline/package.json b/packages/@aws-cdk/aws-datapipeline/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-dax/package.json b/packages/@aws-cdk/aws-dax/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-directoryservice/package.json b/packages/@aws-cdk/aws-directoryservice/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-dlm/package.json b/packages/@aws-cdk/aws-dlm/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-dms/package.json b/packages/@aws-cdk/aws-dms/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-docdb/package.json b/packages/@aws-cdk/aws-docdb/package.json
@@ -80,4 +80,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-dynamodb-global/package.json b/packages/@aws-cdk/aws-dynamodb-global/package.json
@@ -83,4 +83,4 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-dynamodb/package.json b/packages/@aws-cdk/aws-dynamodb/package.json
@@ -84,4 +84,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-ecr-assets/package.json b/packages/@aws-cdk/aws-ecr-assets/package.json
@@ -93,4 +93,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-ecr/package.json b/packages/@aws-cdk/aws-ecr/package.json
@@ -94,4 +94,4 @@
     ]
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-ecs-patterns/package.json b/packages/@aws-cdk/aws-ecs-patterns/package.json
@@ -98,4 +98,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-efs/package.json b/packages/@aws-cdk/aws-efs/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-eks/package.json b/packages/@aws-cdk/aws-eks/package.json
@@ -86,4 +86,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-elasticache/package.json b/packages/@aws-cdk/aws-elasticache/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-elasticbeanstalk/package.json b/packages/@aws-cdk/aws-elasticbeanstalk/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-elasticsearch/package.json b/packages/@aws-cdk/aws-elasticsearch/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-emr/package.json b/packages/@aws-cdk/aws-emr/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-events/package.json b/packages/@aws-cdk/aws-events/package.json
@@ -87,4 +87,4 @@
     ]
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-fsx/package.json b/packages/@aws-cdk/aws-fsx/package.json
@@ -80,4 +80,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-gamelift/package.json b/packages/@aws-cdk/aws-gamelift/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-glue/package.json b/packages/@aws-cdk/aws-glue/package.json
@@ -86,4 +86,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-greengrass/package.json b/packages/@aws-cdk/aws-greengrass/package.json
@@ -80,4 +80,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-guardduty/package.json b/packages/@aws-cdk/aws-guardduty/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-iam/package.json b/packages/@aws-cdk/aws-iam/package.json
@@ -84,4 +84,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-inspector/package.json b/packages/@aws-cdk/aws-inspector/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-iot/package.json b/packages/@aws-cdk/aws-iot/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-iot1click/package.json b/packages/@aws-cdk/aws-iot1click/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-iotanalytics/package.json b/packages/@aws-cdk/aws-iotanalytics/package.json
@@ -80,4 +80,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-iotthingsgraph/package.json b/packages/@aws-cdk/aws-iotthingsgraph/package.json
@@ -80,4 +80,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-kinesis/package.json b/packages/@aws-cdk/aws-kinesis/package.json
@@ -84,4 +84,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-kinesisanalytics/package.json b/packages/@aws-cdk/aws-kinesisanalytics/package.json
@@ -82,4 +82,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-kinesisfirehose/package.json b/packages/@aws-cdk/aws-kinesisfirehose/package.json
@@ -79,4 +79,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-lambda-event-sources/package.json b/packages/@aws-cdk/aws-lambda-event-sources/package.json
@@ -94,4 +94,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-lambda/package.json b/packages/@aws-cdk/aws-lambda/package.json
@@ -118,4 +118,4 @@
     ]
   },
   "stability": "experimental"
-}
+}
diff --git a/packages/@aws-cdk/aws-logs-destinations/package.json b/packages/@aws-cdk/aws-logs-destinations/package.json
@@ -94,4 +94,4 @@
     "node": ">= 8.10.0"
   },
   "stability": "experimental"
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,4 +79,4 @@ @@
         "node": ">= 8.10.0"
       },
       "stability": "experimental"
-    }
+    }