root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.0.x' into 2.1.x 

Closes gh-17268
This commit is contained in:
Stephane Nicoll 2019-06-19 15:30:13 +02:00
parent 6e5ba8077a 11dee3c0d8
commit 7e5ca6d280
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java
View File

@ -66,7 +66,8 @@ public class ManagementServerProperties {
/**
* Sets the port of the management server, use {@code null} if the
* {@link ServerProperties#getPort() server port} should be used. To disable use 0.
* {@link ServerProperties#getPort() server port} should be used. Set to 0 to use a
* random port or set to -1 to disable.
* @param port the port
*/
public void setPort(Integer port) {