dhorwitz@david-horwitz:~/branchmanagement/kernel-1.3.x> svn log -r119618
https://source.sakaiproject.org/svn/kernel/trunk
------------------------------------------------------------------------
r119618 | azeckoski@unicon.net | 2013-02-07 20:10:31 +0200 (Thu, 07 Feb
2013) | 4 lines

KNL-1008 change the maxElementsInMemory property inside
EhCacheFactoryBean.java to maxEntriesOnHeap, in order to sync with
recent ehcache version
Patch from Zhen Q (UM)


------------------------------------------------------------------------
dhorwitz@david-horwitz:~/branchmanagement/kernel-1.3.x> svn merge
-c119618 https://source.sakaiproject.org/svn/kernel/trunk
--- Merging r119618 into '.':
U    kernel-component/src/main/webapp/WEB-INF/authz-components.xml
U
kernel-util/src/main/java/org/sakaiproject/memory/util/EhCacheFactoryBean.java
--- Recording mergeinfo for merge of r119618 into '.':
 U  


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@120187 66ffb92e-73f9-0310-93c1-f5514f145a0a