diff options
| author | Greg Wilkins | 2012-10-15 01:15:44 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2012-10-15 01:15:44 +0000 |
| commit | 9d62229dec84bfb5a2a652bb353abe6e82ec4ac8 (patch) | |
| tree | b784ee9c954325e890678e5e3a9d953e295dfc62 /jetty-deploy/src | |
| parent | bc4550f9b296d39ff0cb6412c282906736f287ad (diff) | |
| parent | 07327cf46d825bc6aa854560a730ee963d023593 (diff) | |
| download | org.eclipse.jetty.project-9d62229dec84bfb5a2a652bb353abe6e82ec4ac8.tar.gz org.eclipse.jetty.project-9d62229dec84bfb5a2a652bb353abe6e82ec4ac8.tar.xz org.eclipse.jetty.project-9d62229dec84bfb5a2a652bb353abe6e82ec4ac8.zip | |
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
Diffstat (limited to 'jetty-deploy/src')
0 files changed, 0 insertions, 0 deletions