Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

2008-03-27 : Release sakai_2-4-x-HEAD-prod-015 : FND=41066 : UCD=????

2008-02-22 : Release sakai_2-4-x-HEAD-prod-014 : FND=41066 : UCD=4069

...

  • Externals sakai_2-4-x-HEAD-prod-003
  • Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3065
  • Sakai Properties
  • JIRAs:
    • No Format
      SAK-1132
      
      svn merge -c 3030
      https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/
      site-manage/site-manage-tool/
      
      U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
      
    • No Format
      SAK-1084
      
      svn merge -c 2955
      https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
      
      U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
      ====
      svn merge -c 3001
      https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
      
      G    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
      U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourseManual.vm
      U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-findCourse.vm
      U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteInformation.vm
      U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm
      ====
      svn merge -c 3004
      https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
      
      G    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
      C    site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
      G    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourseManual.vm
      G    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-findCourse.vm
      G    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteInformation.vm
      G    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm
      ====
      NOTE: I had to resolve conflict in:
      C    site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
      
    • No Format
      SAK-1027
      
      svn merge -c 2882
      https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
      
      U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
      
      C    site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
      ====
      NOTE: I had to resolve conflict in:
      site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
      

...