Merge jdk:master

[openjdk-bot]

Hi all,

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

The following file contains merge conflicts:

• .jcheck/conf

All Committers in this project have access to my personal fork 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 of the openjdk/lanai repository.

# Ensure target branch is up to date
$ git checkout master
$ git pull https://github.com/openjdk/lanai master

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/lanai +5:openjdk-bot-5
$ git checkout openjdk-bot-5

# 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 push https://github.com/openjdk-bot/lanai openjdk-bot-5:5

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

---

Progress

• Change must not contain extraneous whitespace

Download

$ git fetch https://git.openjdk.java.net/lanai pull/99/head:pull/99
$ git checkout pull/99

[bridgekeeper]

👋 Welcome back duke! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[mlbridge]

Webrevs

• 01: Full - Incremental (1086713)
• 00: Merge conflicts (master) (1086713)

[mlbridge]

Mailing list message from Kevin Rushforth on lanai-dev:

I'll fix the (expected) merge conflict later today. Until then, we won't
get syncs from mainline jdk, but that's OK anyway, since we are in the
process of switching from a continuous sync to a periodic (daily for
now) sync.

-- Kevin

-------- Forwarded Message --------
Subject: RFR: Merge jdk:master
Date: Wed, 16 Sep 2020 14:09:39 GMT
From: J.Duke <duke at openjdk.java.net>
To: lanai-dev at openjdk.java.net

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[lanai]) have access
to my [personal
fork](https://github.com/openjdk-bot/lanai) 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://github.com/openjdk/lanai) repository.

# Ensure target branch is up to date
$ git checkout master
$ git pull https://github.com/openjdk/lanai master

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/lanai +5:openjdk-bot-5
$ git checkout openjdk-bot-5

# 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 push https://github.com/openjdk-bot/lanai openjdk-bot-5:5

_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

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

Commit messages:
- 8253206: Enforce whitespace checking for additional source files

The webrev contains the conflicts with master:
- merge conflicts:
https://webrevs.openjdk.java.net/?repo=lanai&pr=99&range=00.conflicts

Changes: https://git.openjdk.java.net/lanai/pull/99/files
Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
Patch: https://git.openjdk.java.net/lanai/pull/99.diff
Fetch: git fetch https://git.openjdk.java.net/lanai pull/99/head:pull/99

PR: https://git.openjdk.java.net/lanai/pull/99