From bfe8e7c4964a8e7abd1e2f76e6f1479f6c05bcce Mon Sep 17 00:00:00 2001
From: epolon <epolon@amazon.com>
Date: Tue, 25 Feb 2020 16:46:54 +0200
Subject: [PATCH 1/2] added additional stack to 'ls' test so it doesn't fail

---
 packages/aws-cdk/test/integ/cli/test-cdk-ls.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/aws-cdk/test/integ/cli/test-cdk-ls.sh b/packages/aws-cdk/test/integ/cli/test-cdk-ls.sh
index c3a79bbc88a17..f2057a1eb6895 100755
--- a/packages/aws-cdk/test/integ/cli/test-cdk-ls.sh
+++ b/packages/aws-cdk/test/integ/cli/test-cdk-ls.sh
@@ -10,6 +10,7 @@ assert "cdk ls" <<HERE
 ${STACK_NAME_PREFIX}-conditional-resource
 ${STACK_NAME_PREFIX}-docker
 ${STACK_NAME_PREFIX}-docker-with-custom-file
+${STACK_NAME_PREFIX}-failed
 ${STACK_NAME_PREFIX}-iam-test
 ${STACK_NAME_PREFIX}-lambda
 ${STACK_NAME_PREFIX}-missing-ssm-parameter

From 6fea222277c68f0c58e4992ec6541e6fd9f50ebd Mon Sep 17 00:00:00 2001
From: epolon <epolon@amazon.com>
Date: Tue, 25 Feb 2020 18:48:30 +0200
Subject: [PATCH 2/2] allow merging to release with no-squash

---
 .mergify.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index c3c903c5d5f65..3947bc631cae0 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -42,7 +42,6 @@ pull_request_rules:
         strict_method: merge
       delete_head_branch: {}
     conditions:
-      - base!=release
       - -title~=(WIP|wip)
       - -label~=(blocked|do-not-merge)
       # Only if no-squash is set