Repository: activemq
Updated Branches:
  refs/heads/trunk 4faf11d82 -> 3f5d17f59


AMQ-5124: Disable jolokia discovery as we need a new jolokia release so it can 
broadcast the correct hostname.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3f5d17f5
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3f5d17f5
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3f5d17f5

Branch: refs/heads/trunk
Commit: 3f5d17f5933ce7a806938c6bc5ea7fbcc368738f
Parents: 4faf11d
Author: Claus Ibsen <[email protected]>
Authored: Sat Mar 29 11:36:06 2014 +0100
Committer: Claus Ibsen <[email protected]>
Committed: Sat Mar 29 11:36:06 2014 +0100

----------------------------------------------------------------------
 assembly/src/release/webapps/api/WEB-INF/web.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/3f5d17f5/assembly/src/release/webapps/api/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/webapps/api/WEB-INF/web.xml 
b/assembly/src/release/webapps/api/WEB-INF/web.xml
index efc9587..b961742 100644
--- a/assembly/src/release/webapps/api/WEB-INF/web.xml
+++ b/assembly/src/release/webapps/api/WEB-INF/web.xml
@@ -39,10 +39,10 @@
     <servlet>
         <servlet-name>jolokia-agent</servlet-name>
         <servlet-class>org.jolokia.http.AgentServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
+        <load-on-startup>1</load-on-startup>     
         <init-param>
           <param-name>discoveryEnabled</param-name>
-          <param-value>true</param-value>
+          <param-value>false</param-value>
         </init-param>
         <init-param>
           <param-name>agentDescription</param-name>

Reply via email to