Author: kkolinko
Date: Mon Nov 25 00:47:50 2013
New Revision: 1545120
URL: http://svn.apache.org/r1545120
Log:
Merged r1544679 from tomcat/trunk:
Fix copy/paste error in log message
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1544679
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1545120&r1=1545119&r2=1545120&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Mon Nov 25 00:47:50 2013
@@ -93,7 +93,7 @@ hostConfig.deployDescriptor.threaded.err
hostConfig.deployDescriptor.localDocBaseSpecified=A docBase {0} inside the
host appBase has been specified, and will be ignored
hostConfig.deployDir=Deploying web application directory {0}
hostConfig.deployDir.error=Error deploying web application directory {0}
-hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment
of directories to completehostConfig.deployWar=Deploying web application
archive {0}
+hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment
of directories to complete
hostConfig.deployWar=Deploying web application archive {0}
hostConfig.deployWar.error=Error deploying web application archive {0}
hostConfig.deployWar.threaded.error=Error waiting for multi-thread deployment
of WAR files to complete
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
