Tomas Kyjovsky 37d7182fc9 Merge upstream-master into karaf-fuse-update ... Conflicts: testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java		2015-11-10 13:44:23 +01:00
..
adapters	KEYCLOAK-1661 Added support for testing adapters/examples on fuse 6.2. Moved CustomKarafContainer from the base module to the adapters/karaf module.	2015-11-10 13:39:59 +01:00
base	Merge upstream-master into karaf-fuse-update	2015-11-10 13:44:23 +01:00
pom.xml	KEYCLOAK-1661 Added support for testing adapters/examples on fuse 6.2. Moved CustomKarafContainer from the base module to the adapters/karaf module.	2015-11-10 13:39:59 +01:00