[sakai] svn commit: r75662 - in msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/kernel: . kernel-impl/src/main/java/org/sakaiproject/site/impl

[jonrcook at indiana.edu]

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

Author: jonrcook at indiana.edu
Date: 2010-04-05 11:42:34 -0400 (Mon, 05 Apr 2010)
New Revision: 75662

Modified:
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/kernel/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSite.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSiteService.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2010-05-15/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java
Log:
svn merge -c-66203 .
--- Reverse-merging r66203 into '.':
U    kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java
bl-uits-jonrcook:kernel jonrcook$ svn log -c-66203 .
------------------------------------------------------------------------
r66203 | chmaurer at iupui.edu | 2009-09-01 10:30:17 -0400 (Tue, 01 Sep 2009) | 2 lines

ONC-1917
Wrap a property around the call for reading properties for Pages so it can be disabled.
------------------------------------------------------------------------
svn merge -c r72286 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/kernel
--- Merging r72286 into '.':
U    kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSite.java
U    kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSiteService.java
G    kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java
bl-uits-jonrcook:kernel jonrcook$ svn log -c r72286 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/kernel
------------------------------------------------------------------------
r72286 | chmaurer at iupui.edu | 2010-01-22 09:20:02 -0500 (Fri, 22 Jan 2010) | 20 lines

ONC-1917
Unmerging ONC customization and merging in the community change.

svn merge -c-66203 .
--- Reverse-merging r66203 into '.':
U    kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java

svn merge -c 66371 https://source.sakaiproject.org/svn/kernel/trunk
--- Merging r66371 into '.':
U    kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSite.java
U    kernel-impl/src/main/java/org/sakaiproject/site/impl/BaseSiteService.java
G    kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java

svn log -c 66371 https://source.sakaiproject.org/svn/kernel/trunk
------------------------------------------------------------------------
r66371 | david.horwitz at uct.ac.za | 2009-09-09 07:43:46 -0400 (Wed, 09 Sep 2009) | 1 line

KNL-259
------------------------------------------------------------------------