From 5b36b274a327713ddc83569f1fcc327f82eea497 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Sun, 21 May 2017 14:53:31 +0200 Subject: [PATCH] doc(maintainer): add `contributor/needs-resolve-conflicts` Replace `contributor/needs-rebase` by `contributor/needs-resolve-conflicts`. --- .github/MAINTAINER.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/MAINTAINER.md b/.github/MAINTAINER.md index 0f4e22c46..b8fe4b712 100644 --- a/.github/MAINTAINER.md +++ b/.github/MAINTAINER.md @@ -8,7 +8,7 @@ If we open/look an issue/PR, we must add a `king/*` and an `area/*`. * `contributor/need-more-information`: we need more information from the contributor in order to analyze a problem. * `contributor/waiting-for-corrections`: we need the contributor to take actions in order to move forward with a PR. **(only for PR)** -* `contributor/needs-rebase`: use it only when there is some conflicts (and an automatic rebase is not possible). **(only for PR)** _[bot, humans]_ +* `contributor/needs-resolve-conflicts`: use it only when there is some conflicts (and an automatic rebase is not possible). **(only for PR)** _[bot, humans]_ ### Kind @@ -56,6 +56,7 @@ If we open/look an issue/PR, we must add a `king/*` and an `area/*`. * `area/webui`: Web UI related. * `area/infrastructure`: related to CI or Traefik building scripts. * `area/documentation`: regards improving/adding documentation. +* `area/cluster`: Traefik clustering related. ### Priority