[tomcat8] 05/06: Merge tag 'upstream/8.0.5'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 474edbcc1c180d549adcd262e36aee934475e44a
Merge: 6b6fc35 d83103e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 29 10:21:38 2014 +0200

    Merge tag 'upstream/8.0.5'
    
    Upstream version 8.0.5

 build.properties.default                           |  2 +-
 .../org/apache/catalina/core/AsyncContextImpl.java | 17 +++++--
 .../apache/catalina/core/LocalStrings.properties   |  1 +
 .../apache/catalina/loader/WebappClassLoader.java  | 32 ++++++++-----
 .../catalina/manager/HTMLManagerServlet.java       |  4 +-
 .../catalina/manager/LocalStrings.properties       |  1 +
 .../apache/catalina/manager/ManagerServlet.java    | 16 +++++--
 java/org/apache/coyote/AsyncContextCallback.java   |  4 +-
 java/org/apache/coyote/AsyncStateMachine.java      | 15 +-----
 .../coyote/http11/InternalNio2OutputBuffer.java    | 32 +++++++++++--
 java/org/apache/jasper/compiler/SmapUtil.java      | 17 +++++--
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  | 38 ++++++++++++++-
 .../tomcat/util/net/res/LocalStrings.properties    |  1 +
 res/maven/mvn.properties.default                   |  2 +-
 .../apache/catalina/comet/TestCometProcessor.java  |  2 +-
 .../catalina/connector/TestCoyoteAdapter.java      | 25 ++++++++--
 .../catalina/nonblocking/TestNonBlockingAPI.java   |  3 +-
 .../apache/catalina/startup/TomcatBaseTest.java    |  8 ++++
 .../apache/coyote/http11/upgrade/TestUpgrade.java  |  3 +-
 webapps/docs/changelog.xml                         | 55 ++++++++++++++++++++++
 webapps/docs/tribes/introduction.xml               |  2 +-
 webapps/docs/web-socket-howto.xml                  | 19 ++++++++
 .../WEB-INF/classes/async/AsyncStockServlet.java   | 13 ++---
 23 files changed, 242 insertions(+), 70 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git