Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke 2015-08-11 13:04:51 -04:00
commit 0bd9cad6ad

View file

@ -73,18 +73,9 @@ $ unzip keycloak-tomcat8-adapter-dist.zip
</auth-constraint> </auth-constraint>
</security-constraint> </security-constraint>
<security-constraint>
<web-resource-collection>
<url-pattern>/*</url-pattern>
</web-resource-collection>
<user-data-constraint>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
<login-config> <login-config>
<auth-method>BASIC</auth-method> <auth-method>BASIC</auth-method>
<realm-name>this is ignored currently/realm-name> <realm-name>this is ignored currently</realm-name>
</login-config> </login-config>
<security-role> <security-role>