From 24be4fc8f8190959e84ab7f998b5de8f1bae9251 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 14 Dec 2020 13:27:50 -0800
Subject: [PATCH] Add v1.5 and v1.6 backport support

---
 .mergify.yml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index b567018a06..8b4b89e0bb 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -50,14 +50,6 @@ pull_request_rules:
       label:
         add:
           - automerge
-  - name: v1.2 backport
-    conditions:
-      - label=v1.2
-    actions:
-      backport:
-        ignore_conflicts: true
-        branches:
-          - v1.2
   - name: v1.3 backport
     conditions:
       - label=v1.3
@@ -74,3 +66,19 @@ pull_request_rules:
         ignore_conflicts: true
         branches:
           - v1.4
+  - name: v1.5 backport
+    conditions:
+      - label=v1.5
+    actions:
+      backport:
+        ignore_conflicts: true
+        branches:
+          - v1.5
+  - name: v1.6 backport
+    conditions:
+      - label=v1.6
+    actions:
+      backport:
+        ignore_conflicts: true
+        branches:
+          - v1.6