This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository undertow.
commit 9aef0eaa2bb3ad996dd545c9ec26eff3a90b52ce Merge: f3d494d 2a3e4ce Author: Markus Koschany <[email protected]> Date: Mon Nov 16 17:22:53 2015 +0100 Merge tag 'upstream/1.3.5' Upstream version 1.3.5 # gpg: Signature made Mon 16 Nov 2015 17:22:49 CET using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] core/pom.xml | 4 +- .../io/undertow/server/ConnectorStatistics.java | 2 + .../undertow/server/ConnectorStatisticsImpl.java | 2 +- .../handlers/resource/PathResourceManager.java | 65 +++++++++++++++------- .../protocol/framed/AbstractFramedChannel.java | 4 +- .../undertow/util/StringReadChannelListener.java | 7 +++ .../server/handlers/file/FileHandlerTestCase.java | 18 ++++++ coverage-report/pom.xml | 2 +- dist/pom.xml | 4 +- examples/pom.xml | 4 +- http2-test-suite/pom.xml | 4 +- parser-generator/pom.xml | 4 +- pom.xml | 2 +- servlet/pom.xml | 4 +- websockets-jsr/pom.xml | 4 +- .../websockets/jsr/ServerWebSocketContainer.java | 9 ++- .../jsr/test/dynamicupgrade/DoUpgradeServlet.java | 6 +- .../test/dynamicupgrade/DynamicEndpointTest.java | 16 +++++- .../jsr/test/dynamicupgrade/EchoEndpoint.java | 11 +++- ...oEndpoint.java => EchoProgramaticEndpoint.java} | 21 ++++--- 20 files changed, 142 insertions(+), 51 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/undertow.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
