diff --git a/r/16.x/admin/index.html b/r/16.x/admin/index.html index 25e58282d..5cd16bf05 100644 --- a/r/16.x/admin/index.html +++ b/r/16.x/admin/index.html @@ -766,5 +766,5 @@

Release Documentation

\ No newline at end of file diff --git a/r/16.x/admin/releasenotes/min-tobira-required.txt b/r/16.x/admin/releasenotes/min-tobira-required.txt new file mode 100644 index 000000000..f8c249abb --- /dev/null +++ b/r/16.x/admin/releasenotes/min-tobira-required.txt @@ -0,0 +1 @@ +Due to a semi-backwards compatible change in the Tobira harvest API, Tobira before version v2.6 won't work with Opencast 16. In order to use OC16 with Tobira, you have to have at least Tobira v2.6. If you are not using Tobira, you can ignore this. diff --git a/r/16.x/admin/sitemap.xml.gz b/r/16.x/admin/sitemap.xml.gz index 1c14e1e6e..4e97bcfdb 100644 Binary files a/r/16.x/admin/sitemap.xml.gz and b/r/16.x/admin/sitemap.xml.gz differ diff --git a/r/16.x/commit b/r/16.x/commit index 5904b785c..9057cf9c0 100644 --- a/r/16.x/commit +++ b/r/16.x/commit @@ -1,5 +1,21 @@ -commit c2553999f66a0ccc545d075913b1e9cc2044e16e +commit c214b264925a2e565db88a393d77f91d54fc1b16 Author: Lars Kiesow -Date: Fri May 24 23:34:09 2024 +0200 +Date: Wed May 29 23:58:18 2024 +0200 - Merge r/15.x into r/16.x + Add changelog note about Tobira harvest API (#5877) + + Like #5875 but this time against the correct branch... + + ### Your pull request should… + + * [ ] have a concise title + * [ ] [close an accompanying + issue](https://docs.opencast.org/develop/developer/#participate/development-process/#automatically-closing-issues-when-a-pr-is-merged) + if one exists + * [ ] [be against the correct + branch](https://docs.opencast.org/develop/developer/development-process#acceptance-criteria-for-patches-in-different-versions) + * [ ] include migration scripts and documentation, if appropriate + * [ ] pass automated tests + * [ ] have a clean commit history + * [ ] [have proper commit messages (title and body) for all + commits](https://medium.com/@steveamaza/e028865e5791) diff --git a/r/16.x/developer/index.html b/r/16.x/developer/index.html index d954b991b..8d9c228a6 100644 --- a/r/16.x/developer/index.html +++ b/r/16.x/developer/index.html @@ -424,5 +424,5 @@

Opencast Development Guides

\ No newline at end of file diff --git a/r/16.x/developer/sitemap.xml.gz b/r/16.x/developer/sitemap.xml.gz index 1c14e1e6e..4e97bcfdb 100644 Binary files a/r/16.x/developer/sitemap.xml.gz and b/r/16.x/developer/sitemap.xml.gz differ