From aa37fc19c067a0380902f0b3265e4d15f33557c3 Mon Sep 17 00:00:00 2001
From: "Alex Ellis (OpenFaaS Ltd)" <alexellis2@gmail.com>
Date: Mon, 3 Aug 2020 18:24:04 +0100
Subject: [PATCH] Update PR template and Derek file

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
---
 .DEREK.yml                       |  3 ++-
 .github/ISSUE_TEMPLATE.md        | 36 --------------------------------
 .github/PULL_REQUEST_TEMPLATE.md |  5 ++++-
 3 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.DEREK.yml b/.DEREK.yml
index 5a962d6..896e6ee 100644
--- a/.DEREK.yml
+++ b/.DEREK.yml
@@ -1,6 +1,7 @@
 maintainers:
  - alexellis
- - rgee0
+ - Waterdrips
+ - utsavanand2
 
 features:
  - dco_check
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 5a4312b..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Expected Behaviour
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
-
-## Current Behaviour
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Docker version `docker version` (e.g. Docker 17.0.05 ):
-
-* What version of Kubernetes are you using? `kubectl version`:
-
-* Operating System and version (e.g. Linux, Windows, MacOS):
-
-* What ARM or Raspberry Pi board are you using?
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index de9ee06..9cc0b49 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -26,5 +26,8 @@
 - [ ] My code follows the code style of this project.
 - [ ] I have tested this change and prove it works
 - [ ] I've read the [CONTRIBUTION](https://github.com/alexellis/k8s-on-raspbian#contributions) guide
-- [ ] I have signed-off my commits with `git commit -s`
 
+## Required for merge:
+
+- [ ] I have signed-off my commits, fix with: `git commit --amend --signoff`
+- [ ] My PR only contains one commit, fix with: `git rebase -i HEAD~N`, where `N` = number of commits.