[sakai] svn commit: r89861 - in kernel/branches/kernel-1.1.x: . kernel-impl/src kernel-impl/src/main/java/org/sakaiproject/memory/impl kernel-impl/src/main/java/org/sakaiproject/site/impl

[david.horwitz at uct.ac.za]

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=89861

Author: david.horwitz at uct.ac.za
Date: 2011-03-16 04:28:16 -0400 (Wed, 16 Mar 2011)
New Revision: 89861

Modified:
   kernel/branches/kernel-1.1.x/
   kernel/branches/kernel-1.1.x/kernel-impl/src/
   kernel/branches/kernel-1.1.x/kernel-impl/src/main/java/org/sakaiproject/memory/impl/MemCache.java
   kernel/branches/kernel-1.1.x/kernel-impl/src/main/java/org/sakaiproject/site/impl/SiteCacheImpl.java
Log:
dhorwitz at david-horwitz:~/branchManagement/kernel-1.1.x> svn log -r88169
https://source.sakaiproject.org/svn/kernel/trunk
------------------------------------------------------------------------                                                                                                            
r88169 | david.horwitz at uct.ac.za | 2011-02-09 09:15:19 +0200 (Wed, 09
Feb 2011) | 2 lines                                                                                           
                                                                                                                                                                                    
KNL-652 apply patch from Umich                                                                                                                                                      
                                                                                                                                                                                    
------------------------------------------------------------------------                                                                                                            
dhorwitz at david-horwitz:~/branchManagement/kernel-1.1.x> svn merge
-c88169 https://source.sakaiproject.org/svn/kernel/trunk                                                          
--- Merging r88169 into 'kernel-impl/src':                                                                                                                                          
U
kernel-impl/src/main/java/org/sakaiproject/site/impl/SiteCacheImpl.java                                                                                                        
U
kernel-impl/src/main/java/org/sakaiproject/memory/impl/MemCache.java                                                                                                           
dhorwitz at david-horwitz:~/branchManagement/kernel-1.1.x> svn merge
-c88170 https://source.sakaiproject.org/svn/kernel/trunk                                                   
--- Merging r88170 into 'kernel-impl/src':                                                                                                                                          
G
kernel-impl/src/main/java/org/sakaiproject/site/impl/SiteCacheImpl.java