| 
 | 
        
        
            
    
        
        
            1/20/2015 10:24:37 AM
         
        
        
            to support EAP 6.4
Conflicts:
	integration/as7-eap6/adapter/src/main/java/org/keycloak/adapters/as7/CatalinaSecurityContextHelper.java 
        
         
     
    
 
 | 
        
        
            
    
        
        
            11/5/2014 12:34:56 PM
         
        
        
            endpoints
Conflicts:
	model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java 
        
         
     
    
 
 | 
        
        
            | 
 | 
        
        
            
    
        
        
            10/31/2014 9:33:36 AM
         
        
        
            'Bearer role' loglevel to debug 
        
         
     
    
 
 | 
        
        
            | 
 | 
        
        
            | 
 | 
        
        
            | 
 | 
        
        
            
    
        
        
            10/29/2014 11:22:15 AM
         
        
        
            1 0 
        
         
     
    
 
 | 
        
        
            | 
 |