Bill Burke edb9f0cecf merge conflicts

2015-04-15 11:18:47 -04:00

..

docker-cluster

bump pom versio

2015-04-02 09:36:43 -04:00

integration

merge conflicts

2015-04-15 11:18:47 -04:00

jetty

bump pom versio

2015-04-02 09:36:43 -04:00

performance

KEYCLOAK-1187 First round: Combined ApplicationModel and OAuthClientModel into ClientModel. Removed OAuth Clients from Admin console and renamed Applications to Clients.

2015-04-09 12:27:30 +02:00

performance-web

bump pom versio

2015-04-02 09:36:43 -04:00

proxy

bump pom versio

2015-04-02 09:36:43 -04:00

tomcat6

bump pom versio

2015-04-02 09:36:43 -04:00

tomcat7

bump pom versio

2015-04-02 09:36:43 -04:00

tomcat8

bump pom versio

2015-04-02 09:36:43 -04:00

tools

KEYCLOAK-1187 First round: Combined ApplicationModel and OAuthClientModel into ClientModel. Removed OAuth Clients from Admin console and renamed Applications to Clients.

2015-04-09 12:27:30 +02:00

pom.xml

bump pom versio

2015-04-02 09:36:43 -04:00