Merge branch 'master' into fix/default-policy-name-limit

aws · Aug 1, 2019 · 4b1f240 · 4b1f240
2 parents bb62319 + 6733e54
commit 4b1f240
Show file tree

Hide file tree

Showing 157 changed files with 16,675 additions and 5,385 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -0,0 +1,17 @@
+# See https://doc.mergify.io
+
+pull_request_rules:
+- name: auto_merge
+  conditions: 
+    - -title~=(WIP|wip)
+    - -merged
+    - -closed
+    - -locked
+    - -label=blocked
+    - "#approved-reviews-by>=1"
+    - "#changes-requested-reviews-by=0"
+    - status-success=AWS CodeBuild us-east-1 (aws-cdk-build)
+  actions:
+    merge:
+      method: squash
+      strict: smart
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "conventional-changelog-cli": "^2.0.21",
     "fs-extra": "^8.1.0",
     "jest": "^24.8.0",
-    "jsii-diff": "^0.14.2",
+    "jsii-diff": "^0.14.3",
     "lerna": "^3.16.4",
     "nodeunit": "^0.11.3",
     "nyc": "^14.1.1",

diff --git a/packages/@aws-cdk/alexa-ask/package-lock.json b/packages/@aws-cdk/alexa-ask/package-lock.json
diff --git a/packages/@aws-cdk/app-delivery/package-lock.json b/packages/@aws-cdk/app-delivery/package-lock.json