Merge branch '2.3.x'

Closes gh-23573
This commit is contained in:
Stephane Nicoll 2020-10-02 09:34:49 +02:00
commit 797c12e75d
2 changed files with 3 additions and 3 deletions

View File

@ -55,7 +55,7 @@ added after the original pull request but before a merge.
`./gradlew format`. Note that if you have format violations in `buildSrc`, you can fix
them by running `./gradlew -p buildSrc format` from the project root directory.
* The build includes checkstyle rules for many of our code conventions. Run
`./gradlew checkstyleMain checkstyleTest` if you want to check you changes are
`./gradlew checkstyleMain checkstyleTest` if you want to check your changes are
compliant.
* Make sure all new `.java` files have a Javadoc class comment with at least an
`@author` tag identifying you, and preferably at least a paragraph on what the class is

View File

@ -1306,7 +1306,7 @@ If you do not want to expose endpoints over HTTP, you can set the management por
management.server.port=-1
----
This can be achieved using the configprop:management.endpoints.web.exposure.exclude[] property as well, as shown in following example:
This can be achieved using the configprop:management.endpoints.web.exposure.exclude[] property as well, as shown in the following example:
[source,properties,indent=0,configprops]
----
@ -1721,7 +1721,7 @@ You can also change the interval at which metrics are sent to New Relic:
management.metrics.export.newrelic.step=30s
----
By default, metrics are published via REST calls but it also possible to use the Java Agent API if you have it on the classpath:
By default, metrics are published via REST calls but it is also possible to use the Java Agent API if you have it on the classpath:
[source,properties,indent=0,configprops]
----