[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  92e2ed5689671bbc003bfe752f660f769e86bf50 (commit)
       via  3c12582e8f384ff551bd518ec4e5b6a5f7e9cf71 (commit)
      from  0bd93bbe4ae60e5f318b298bfe617e468a7b71d0 (commit)


- Log -----------------------------------------------------------------
commit 92e2ed5689671bbc003bfe752f660f769e86bf50
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Apr 2 11:38:23 2017 +0200

    Remind people to have 'Fixes #XXXX' in the commit message
    
    It's of course also possible to just add them to the PR description,
    but having these lines in the commit messages provide better
    automation.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3104)

commit 3c12582e8f384ff551bd518ec4e5b6a5f7e9cf71
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Apr 2 11:28:04 2017 +0200

    Fixup the github pull request template
    
    When creating a single commit PR, github will now automatically
    include the commit comment first in the pull request description, and
    add the template content last.  That makes the description section at
    the end useless.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3104)

-----------------------------------------------------------------------

Summary of changes:
 .github/PULL_REQUEST_TEMPLATE.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d4f77fd..7b384b1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,16 +1,14 @@
 <!--
-Thank you for your pull request. Please review below requirements.
+Thank you for your pull request. Please review these requirements:
 
 Contributors guide: https://github.com/openssl/openssl/blob/master/CONTRIBUTING
+
+Other than that, provide a description above this comment if there isn't one already
+
+If this fixes a github issue, make sure to have a line saying 'Fixes #XXXX' (without quotes) in the commit message.
 -->
 
 ##### Checklist
 <!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
 - [ ] documentation is added or updated
 - [ ] tests are added or updated
-
-##### Description of change
-<!-- Provide a description of the changes.
-
-If it fixes a github issue, add Fixes #XXXX.
--->