Tomas Kyjovsky 6d7092ef4c Merge upstream-master into KEYCLOAK-1642 ... Conflicts: testsuite/integration-arquillian/tests/adapters/eap6/pom.xml testsuite/integration-arquillian/tests/adapters/pom.xml		2016-01-20 16:12:20 +01:00
..
eap7	KEYCLOAK-2347: Test - Adapter - EAP 7.0	2016-01-19 13:59:07 +01:00