diff options
author | Greg Wilkins | 2013-04-25 00:42:27 +0000 |
---|---|---|
committer | Greg Wilkins | 2013-04-25 00:42:27 +0000 |
commit | 9f0fabe951dc0d81602a48d82b8dc959bd70d6ff (patch) | |
tree | ffe3067bf9e3ccb6e3e91257679af1cdda2d7f56 /jetty-jndi | |
parent | 8740616b3738dd0502859d82c6bb8267e0dfbd3f (diff) | |
parent | 5306c540bf46d72824af4ac5ea25b43d48a99658 (diff) | |
download | org.eclipse.jetty.project-9f0fabe951dc0d81602a48d82b8dc959bd70d6ff.tar.gz org.eclipse.jetty.project-9f0fabe951dc0d81602a48d82b8dc959bd70d6ff.tar.xz org.eclipse.jetty.project-9f0fabe951dc0d81602a48d82b8dc959bd70d6ff.zip |
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java
jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
Diffstat (limited to 'jetty-jndi')
0 files changed, 0 insertions, 0 deletions