Merge branch 'master' into addL2PatternProps

aws · Sep 24, 2019 · e1615a2 · e1615a2
2 parents 74f232e + 7ce8112
commit e1615a2
Show file tree

Hide file tree

Showing 39 changed files with 18,007 additions and 520 deletions.
diff --git a/packages/@aws-cdk/assets/package-lock.json b/packages/@aws-cdk/assets/package-lock.json
diff --git a/packages/@aws-cdk/assets/package.json b/packages/@aws-cdk/assets/package.json
@@ -71,7 +71,7 @@
     "cdk-build-tools": "file:../../../tools/cdk-build-tools",
     "cdk-integ-tools": "file:../../../tools/cdk-integ-tools",
     "pkglint": "file:../../../tools/pkglint",
-    "sinon": "^7.4.2",
+    "sinon": "^7.5.0",
     "ts-mock-imports": "^1.2.6"
   },
   "dependencies": {