Fwd: [openjdk/lanai] Merge jdk:master (#95)

[Kevin Rushforth]

Since it was my change in the jdk repo that caused the merge conflict, 
I'll fix it.

-- Kevin



-------- Forwarded Message --------
Subject: 	[openjdk/lanai] Merge jdk:master (#95)
Date: 	Fri, 11 Sep 2020 08:20:33 -0700
From: 	openjdk-bot <notifications at github.com>
Reply-To: 	openjdk/lanai 
<reply+AIIVFVCAZ7B4NRZE6AMK7BF5M53MDEVBNHHCTMFF64 at reply.github.com>
To: 	openjdk/lanai <lanai at noreply.github.com>
CC: 	Subscribed <subscribed at noreply.github.com>



Hi all,

this is an /automatically/ generated pull request to notify you that 
there is 1 commit from the branch |jdk:master|that can *not* be merged 
into the branch |master|:

The following file contains merge conflicts:

  * .jcheck/conf

All Committers in this project 
<https://openjdk.java.net/census#Optional%5Blanai%5D> have access to my 
personal fork 
<https://urldefense.com/v3/__https://github.com/openjdk-bot/lanai__;!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OGYpSgDc$> 
and can therefore help resolve these merge conflicts (you may want to 
coordinate who should do this).
The following paragraphs will give an example on how to solve these 
merge conflicts and push the resulting merge commit to this pull request.
The below commands should be run in a local clone of your personal fork 
<https://wiki.openjdk.java.net/display/skara#Skara-Personalforks> of the 
openjdk/lanai 
<https://urldefense.com/v3/__https://github.com/openjdk/lanai__;!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OMnV1wcp$> 
repository.

# Ensure target branch is up to date
$ git checkout master
$ git pullhttps://github.com/openjdk/lanai  <https://urldefense.com/v3/__https://github.com/openjdk/lanai__;!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OMnV1wcp$>  master

# Fetch and checkout the branch for this pull request
$ git fetchhttps://github.com/openjdk-bot/lanai  <https://urldefense.com/v3/__https://github.com/openjdk-bot/lanai__;!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OGYpSgDc$>  +4:openjdk-bot-4
$ git checkout openjdk-bot-4

# Merge the target branch
$ git merge master

When you have resolved the conflicts resulting from the |git merge| 
command above, run the following commands to create a merge commit:

$ git add paths/to/files/with/conflicts
$ git commit -m'Merge jdk:master'

When you have created the merge commit, run the following command to 
push the merge commit to this pull request:

$ git pushhttps://github.com/openjdk-bot/lanai  <https://urldefense.com/v3/__https://github.com/openjdk-bot/lanai__;!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OGYpSgDc$>  openjdk-bot-4:4

/Note/: if you are using SSH to push commits to GitHub, then change the 
URL in the above |git push| command accordingly.

Thanks,
J. Duke

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


        You can view, comment on, or merge this pull request online at:

https://github.com/openjdk/lanai/pull/95 
<https://urldefense.com/v3/__https://github.com/openjdk/lanai/pull/95__;!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OArowt8q$>


        Commit Summary

  * 8253031: git jcheck complains about invalid tags in jdk repo after
    fix for JDK-8252844


        File Changes

  * *M* .jcheck/conf
    <https://urldefense.com/v3/__https://github.com/openjdk/lanai/pull/95/files*diff-916bf78a0828e8bef329c874c16980bf__;Iw!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OCC4cNOm$>
    (2)


        Patch Links:

  * https://github.com/openjdk/lanai/pull/95.patch
    <https://urldefense.com/v3/__https://github.com/openjdk/lanai/pull/95.patch__;!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OPHbdrgK$>
  * https://github.com/openjdk/lanai/pull/95.diff
    <https://urldefense.com/v3/__https://github.com/openjdk/lanai/pull/95.diff__;!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OL0wSD8p$>

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub 
<https://urldefense.com/v3/__https://github.com/openjdk/lanai/pull/95__;!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OArowt8q$>, 
or unsubscribe 
<https://urldefense.com/v3/__https://github.com/notifications/unsubscribe-auth/AIIVFVACGSFKQL57ASETMETSFI54DANCNFSM4RHWQL2Q__;!!GqivPVa7Brio!OpGSqomHifiKLjEQlZMrSi7nLXTNRFgbHf_lA38SqEWigPZB105lwBghtlX5OPd1wBV4$>.