svn commit: r1628985 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/engine.xml

[schultz]

Author: schultz
Date: Thu Oct  2 14:40:39 2014
New Revision: 1628985

URL: http://svn.apache.org/r1628985
Log:
Back-port r1628984 to fix 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57049
Clarify that jvmRoute can be set with either Engine.jvmRoute or a system 
property.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1628984

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1628985&r1=1628984&r2=1628985&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct  2 14:40:39 2014
@@ -75,7 +75,12 @@
         Correct documentation for <code>ServerCookie.ALLOW_NAME_ONLY</code>
         system property. (kkolinko)
       </fix>
-    </changelog>
+      <fix>
+        <bug>57049</bug>: Clarified that <code>jvmRoute</code> can be set in
+        <code>&lt;Engine&gt;</code>'s <code>jvmRoute</code> or in a system
+        property. (schultz)
+      </fix>
+      </changelog>
   </subsection>
 </section>
 <section name="Tomcat 7.0.56 (violetagg)">

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml?rev=1628985&r1=1628984&r2=1628985&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml Thu Oct  2 14:40:39 2014
@@ -93,6 +93,12 @@
         the generated session identifier, therefore allowing the front end
         proxy to always forward a particular session to the same Tomcat
         instance.</p>
+        <p>
+            Note that the <code>jvmRoute</code> can also be set using the
+            <code>jvmRoute</code> system property. The <code>jvmRoute</code>
+            set in an <code>&lt;Engine&gt;</code> attribute will override
+            any <code>jvmRoute</code> system property.
+        </p>
       </attribute>
 
       <attribute name="name" required="true">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org