vramik 39856c32d1 Merge branch 'master' of https://github.com/keycloak/keycloak into clients ... Conflicts: testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/FlashMessage.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/OnOffSwitch.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java		2015-12-07 15:44:34 +01:00
..
docker-cluster	Version bump	2015-12-01 19:54:28 +01:00
integration	KEYCLOAK-2197 Fix broker tests to work with sybase. Added LoggingRule	2015-12-04 11:44:30 +01:00
integration-arquillian	Merge branch 'master' of https://github.com/keycloak/keycloak into clients	2015-12-07 15:44:34 +01:00
jetty	Version bump	2015-12-01 19:54:28 +01:00
performance	Version bump	2015-12-01 19:54:28 +01:00
proxy	Version bump	2015-12-01 19:54:28 +01:00
tomcat6	Version bump	2015-12-01 19:54:28 +01:00
tomcat7	Version bump	2015-12-01 19:54:28 +01:00
tomcat8	Version bump	2015-12-01 19:54:28 +01:00
wildfly	Make it possible to set hibernate spec artifact id with a property in parent pom	2015-09-23 15:36:40 +02:00
pom.xml	Version bump	2015-12-01 19:54:28 +01:00