vendor-drop-trunk-R42972

svn export -r 42972 https://source.sakaiproject.org/svn/authz/trunk authz-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/authz vendor/current-trunk authz-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/authz/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/authz/tags/trunk-R42972 -m 'tagging authz vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/authz/trunk authz-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/authz/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/authz/tags/trunk-R42972 authz-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' authz-trunk-workingcopy
Conflict:
C    authz-trunk-workingcopy/authz-impl/impl/pom.xml
Committed revision 4331


svn export -r 42972 https://source.sakaiproject.org/svn/component/trunk component-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/component vendor/current-trunk component-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/component/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/component/tags/trunk-R42972 -m 'tagging component vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/component/trunk component-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/component/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/component/tags/trunk-R42972 component-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' component-trunk-workingcopy
Conflict:
C    component-trunk-workingcopy/component-impl/impl/pom.xml
Committed revision 4334


svn export -r 42972 https://source.sakaiproject.org/svn/course-management/trunk course-management-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/course-management vendor/current-trunk course-management-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/course-management/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/course-management/tags/trunk-R42972 -m 'tagging course-management vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/course-management/trunk course-management-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/course-management/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/course-management/tags/trunk-R42972 course-management-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' course-management-trunk-workingcopy
Conflict:
N/A
Committed revision 4337


svn export -r 42972 https://source.sakaiproject.org/svn/dav/trunk dav-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/dav vendor/current-trunk dav-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/dav/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/dav/tags/trunk-R42972 -m 'tagging dav vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/dav/trunk dav-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/dav/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/dav/tags/trunk-R42972 dav-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' dav-trunk-workingcopy
Conflict:
C    dav-trunk-workingcopy/dav/src/java/org/sakaiproject/dav/DavServlet.java
Committed revision 4340


svn export -r 42972 https://source.sakaiproject.org/svn/gradebook/trunk gradebook-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/gradebook vendor/current-trunk gradebook-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/tags/trunk-R42972 -m 'tagging gradebook vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/trunk gradebook-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/tags/trunk-R42972 gradebook-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' gradebook-trunk-workingcopy
Conflict:
N/A
Committed revision 4343


svn export -r 42972 https://source.sakaiproject.org/svn/help/trunk help-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/help vendor/current-trunk help-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/help/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R42972 -m 'tagging help vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/help/trunk help-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R42972 help-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' help-trunk-workingcopy
Conflict:
N/A
Committed revision 4346


svn export -r 42972 https://source.sakaiproject.org/svn/jobscheduler/trunk jobscheduler-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler vendor/current-trunk jobscheduler-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler/tags/trunk-R42972 -m 'tagging jobscheduler vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler/trunk jobscheduler-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler/tags/trunk-R42972 jobscheduler-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' jobscheduler-trunk-workingcopy
Conflict:
N/A
Committed revision 4349


svn export -r 42972 https://source.sakaiproject.org/svn/login/trunk login-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/login vendor/current-trunk login-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/login/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/login/tags/trunk-R42972 -m 'tagging login vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/login/trunk login-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/login/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/login/tags/trunk-R42972 login-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' login-trunk-workingcopy
Conflict:
C    login-trunk-workingcopy/login-tool/tool/pom.xml
Committed revision 4352


svn export -r 42972 https://source.sakaiproject.org/svn/master/trunk master-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/master vendor/current-trunk master-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/master/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/master/tags/trunk-R42972 -m 'tagging master vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/master/trunk master-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/master/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/master/tags/trunk-R42972 master-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' master-trunk-workingcopy
Conflict:
N/A
Committed revision 4355


svn export -r 42972 https://source.sakaiproject.org/svn/portal/trunk portal-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/portal vendor/current-trunk portal-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/portal/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/portal/tags/trunk-R42972 -m 'tagging portal vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/portal/trunk portal-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/portal/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/portal/tags/trunk-R42972 portal-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' portal-trunk-workingcopy
Conflicts:
C    portal-trunk-workingcopy/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java
C    portal-trunk-workingcopy/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
C    portal-trunk-workingcopy/portal-impl/impl/pom.xml
C    portal-trunk-workingcopy/portal-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm
Committed revision 4358


svn export -r 42972 https://source.sakaiproject.org/svn/providers/trunk providers-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/providers vendor/current-trunk providers-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/providers/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/providers/tags/trunk-R42972 -m 'tagging providers vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/providers/trunk providers-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/providers/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/providers/tags/trunk-R42972 providers-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' providers-trunk-workingcopy
Conflict:
N/A
Committed revision 4361


svn export -r 42972 https://source.sakaiproject.org/svn/reference/trunk reference-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/reference vendor/current-trunk reference-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/reference/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/reference/tags/trunk-R42972 -m 'tagging reference vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/reference/trunk reference-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/reference/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/reference/tags/trunk-R42972 reference-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' reference-trunk-workingcopy
Conflict:
N/A
Committed revision 4364


svn export -r 42972 https://source.sakaiproject.org/svn/rwiki/trunk rwiki-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/rwiki vendor/current-trunk rwiki-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/rwiki/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/rwiki/tags/trunk-R42972 -m 'tagging rwiki vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/rwiki/trunk rwiki-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/rwiki/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/rwiki/tags/trunk-R42972 rwiki-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' rwiki-trunk-workingcopy
Conflict:
C    rwiki-trunk-workingcopy/rwiki-tool/tool/src/webapp/WEB-INF/web.xml
Committed revision 4367


svn export -r 42972 https://source.sakaiproject.org/svn/sam/trunk sam-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/sam vendor/current-trunk sam-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/sam/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/sam/tags/trunk-R42972 -m 'tagging sam vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/sam/trunk sam-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/sam/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/sam/tags/trunk-R42972 sam-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' sam-trunk-workingcopy
Conflict:
N/A
Committed revision 4370


svn export -r 42972 https://source.sakaiproject.org/svn/site/trunk site-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/site vendor/current-trunk site-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/site/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/site/tags/trunk-R42972 -m 'tagging site vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/site/trunk site-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/site/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/site/tags/trunk-R42972 site-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' site-trunk-workingcopy
Conflict:
N/A
Committed revision 4373


svn export -r 42972 https://source.sakaiproject.org/svn/test-harness/trunk test-harness-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/test-harness vendor/current-trunk test-harness-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/test-harness/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/test-harness/tags/trunk-R42972 -m 'tagging test-harness vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/test-harness/trunk test-harness-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/test-harness/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/test-harness/tags/trunk-R42972 test-harness-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' test-harness-trunk-workingcopy
Conflict:
N/A
Committed revision 4376


svn export -r 42972 https://source.sakaiproject.org/svn/tool/trunk tool-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/tool vendor/current-trunk tool-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/tool/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/tool/tags/trunk-R42972 -m 'tagging tool vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/tool/trunk tool-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/tool/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/tool/tags/trunk-R42972 tool-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' tool-trunk-workingcopy
Conflicts:
C    tool-trunk-workingcopy/tool-tool/su/pom.xml
C    tool-trunk-workingcopy/tool-util/.classpath
C    tool-trunk-workingcopy/tool-util/servlet/pom.xml
Committed revision 4379


svn export -r 42972 https://source.sakaiproject.org/svn/user/trunk user-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/user vendor/current-trunk user-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/user/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/user/tags/trunk-R42972 -m 'tagging user vendor drop trunk-R42972'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/user/trunk user-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/user/tags/trunk-R36116 https://mware.ucdavis.edu/svn/ucd-sakai/user/tags/trunk-R42972 user-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R36116:R42972 (trunk)' user-trunk-workingcopy
Conflict:
N/A
Committed revision 4382