diff options
| author | Jenkins CI <ci@sonarsource.com> | 2016-04-14 22:26:08 +0200 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2016-04-14 22:26:08 +0200 |
| commit | 8a49482fc8b942ea75ddab4fee58d75a5c6eee9a (patch) | |
| tree | ef347ae401089ec4c09f21287c7e605a21058634 /sonar-application | |
| parent | bf79ed11bd311395aaf01a0d17f72a835ef0d7fb (diff) | |
| parent | ec0c9c265fed27964480ce51edc8a191b5234be7 (diff) | |
| download | sonarqube-8a49482fc8b942ea75ddab4fee58d75a5c6eee9a.tar.gz sonarqube-8a49482fc8b942ea75ddab4fee58d75a5c6eee9a.zip | |
Automatic merge from branch-5.5
* origin/branch-5.5:
SONAR-7429 defaults of HTTPS proxy are values of HTTP proxy
Add context when failing to map a db measure to a ws measure
SONAR-7187 Fix perf issue in selectByQuery
Add support of WS api/ce/task to sonar-ws
Add partial support of api/projects to sonar-ws
SONAR-7427 Remove "effort_to_reach_reliability_rating_a" and "effort_to_reach_security_rating_a" from js
Diffstat (limited to 'sonar-application')
| -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 1d700de0695..c4118f20895 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -188,8 +188,7 @@ # HTTP proxy (default none) #http.proxyHost= #http.proxyPort= - -# HTTPS proxy (default none) +# HTTPS proxy (defaults are values of http.proxyHost and http.proxyPort) #https.proxyHost= #https.proxyPort= |