Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
	server/sonar-search/src/main/java/org/sonar/search/SearchServer.java

1 files changed, 0 insertions, 9 deletions

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 283d23abbf8..3fa9963d19a 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -69,11 +69,6 @@ sonar.jdbc.timeBetweenEvictionRunsMillis=30000
 #sonar.web.javaOpts=-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError \
 #  -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false
 
-# Web server requires a JMX RMI port to be open. Default is 9003. A free port is
-# dynamically used is value is 0.
-# This JMX port must be private and must not be exposed to the Internet.
-#sonar.web.jmxPort=9003
-
 # Binding IP address. For servers with more than one IP address, this property specifies which
 # address will be used for listening on the specified ports.
 # By default, ports will be used on all IP addresses associated with the server.
@@ -182,10 +177,6 @@ sonar.jdbc.timeBetweenEvictionRunsMillis=30000
 # This port must be private and must not be exposed to the Internet.
 #sonar.search.port=9001
 
-# JMX RMI port to monitor Elasticsearch process. Default is 9002. Use 0 to get a free port.
-# It must be private and must not be exposed to the Internet.
-#sonar.search.jmxPort=9002
-
 
 #--------------------------------------------------------------------------------------------------
 # UPDATE CENTER