Versions Compared

Key

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

...

  • Externals sakai_2-4-x-HEAD-prod-017
  • Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R ????
  • Sakai Properties
  • JIRAs:
    • (warning)
      No Format
      SAK-798
      
      Redoing this merge since I mistakenly committed patch SAK-1305
      svn merge -r 4474:4473 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD-prod site-manage/
      U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
      U    site-manage/site-manage-util/.classpath
      Committed revision 4491.
      
      svn merge -c 3980 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD site-manage
      U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
      svn merge -c 4490 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD site-manage
      G    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
      U    site-manage/site-manage-util/.classpath
      Committed revision 4492.
      
    • No Format
      SAK-1746
      
      ~/src/sakai-2-4-x-HEAD-prod/ # svn merge -c 4417 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 gradebook/
      U    gradebook/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java
      Committed revision 4507.
      
      

...