Merge branch 'stable-2.5' into stable-2.6

* stable-2.5:
  Bump openid4java dependency to 0.9.8

Change-Id: Ia946c4a5a81106d6158016ac336ba7c9b7247911
This commit is contained in:
Shawn Pearce
2013-05-14 14:10:44 -07:00
3 changed files with 4 additions and 14 deletions

View File

@@ -38,10 +38,8 @@ log4j.logger.eu.medsea.mimeutil=WARN
# Silence non-critical messages from openid4java
#
log4j.logger.org.apache.http=WARN
log4j.logger.org.apache.xml=WARN
log4j.logger.httpclient.wire=WARN
log4j.logger.org.apache.commons.httpclient=WARN
log4j.logger.org.apache.commons.httpclient.HttpMethodBase=ERROR
log4j.logger.org.openid4java=WARN
log4j.logger.org.openid4java.consumer.ConsumerManager=FATAL
log4j.logger.org.openid4java.discovery.Discovery=ERROR