diff options
| author | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2016-06-13 09:45:53 +0200 |
|---|---|---|
| committer | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2016-06-13 09:45:53 +0200 |
| commit | 475108c6cc00851cc76e57e01492a6df30c12a4b (patch) | |
| tree | ab9814538bbe2334e38243b98892843259b1b882 /sonar-application/src | |
| parent | a327a95c3552ffb01f13b49074a2937b1aa2c9e0 (diff) | |
| parent | 47d02a5e043b7a97c420bc47dfadb9d4b4b3c6eb (diff) | |
| download | sonarqube-475108c6cc00851cc76e57e01492a6df30c12a4b.tar.gz sonarqube-475108c6cc00851cc76e57e01492a6df30c12a4b.zip | |
Automatic merge from branch-5.6
* origin/branch-5.6:
SONAR-7752 Documentation of sonar.web.port in sonar.properties is not correct
Fix 2 links in javadoc of org.sonar.api.batch
Diffstat (limited to 'sonar-application/src')
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 89f0607f8be..0724b46c2c9 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -101,8 +101,7 @@ # Web context. When set, it must start with forward slash (for example /sonarqube). # The default value is root context (empty value). #sonar.web.context= - -# TCP port for incoming HTTP connections. Disabled when value is -1. +# TCP port for incoming HTTP connections. Default value is 9000. #sonar.web.port=9000 |