Revert Wrongly Merged Commits

CHANGELOG.md

@@ -1,48 +1,3 @@
-Changelog for reva 2.27.0 (2024-12-12)
-=======================================
-
-The following sections list the changes in reva 2.27.0 relevant to
-reva users. The changes are ordered by importance.
-
-Summary
--------
-
-*   Fix #4985: Drop unneeded session locks
-*   Fix #5000: Fix ceph build
-*   Fix #4989: Deleting OCM share also updates storageprovider
-*   Enh #4998: Emit event when an ocm share is received
-*   Enh #4996: Get rid of some cases of unstructured logging
-
-Details
--------
-
-*   Bugfix #4985: Drop unneeded session locks
-
-   We no longer lock session metadada files, as they are already written atomically.
-
-   https://github.com/cs3org/reva/pull/4985
-
-*   Bugfix #5000: Fix ceph build
-
-   https://github.com/cs3org/reva/pull/5000
-
-*   Bugfix #4989: Deleting OCM share also updates storageprovider
-
-   When remvoving an OCM share we're now also removing the related grant from the storage
-   provider.
-
-   https://github.com/owncloud/ocis/issues/10262
-   https://github.com/cs3org/reva/pull/4989
-
-*   Enhancement #4998: Emit event when an ocm share is received
-
-   https://github.com/owncloud/ocis/issues/10718
-   https://github.com/cs3org/reva/pull/4998
-
-*   Enhancement #4996: Get rid of some cases of unstructured logging
-
-   https://github.com/cs3org/reva/pull/4996
-
 Changelog for reva 2.26.8 (2024-12-04)
 =======================================
 
@@ -5819,27 +5774,6 @@ Details
 
    https://github.com/cs3org/reva/pull/2922
 
-Changelog for reva 2.4.1 (2022-05-24)
-=======================================
-
-The following sections list the changes in reva 2.4.1 relevant to
-reva users. The changes are ordered by importance.
-
-Summary
--------
-
-*   Fix #2891: Add missing http status code
-
-Details
--------
-
-*   Bugfix #2891: Add missing http status code
-
-   This Fix adds a missing status code to the InsufficientStorage error in reva, to allow tus to
-   pass it through.
-
-   https://github.com/cs3org/reva/pull/2891
-
 Changelog for reva 2.4.0 (2022-05-24)
 =======================================
 
@@ -5983,6 +5917,27 @@ Details
 
    https://github.com/cs3org/reva/pull/2792
 
+Changelog for reva 2.4.1 (2022-05-24)
+=======================================
+
+The following sections list the changes in reva 2.4.1 relevant to
+reva users. The changes are ordered by importance.
+
+Summary
+-------
+
+*   Fix #2891: Add missing http status code
+
+Details
+-------
+
+*   Bugfix #2891: Add missing http status code
+
+   This Fix adds a missing status code to the InsufficientStorage error in reva, to allow tus to
+   pass it through.
+
+   https://github.com/cs3org/reva/pull/2891
+
 Changelog for reva 2.3.1 (2022-05-08)
 =======================================
 

RELEASE_DATE

@@ -1 +1 @@
-2024-12-12
+2024-12-04

VERSION

@@ -1 +1 @@
-2.27.0
+2.26.8

changelog/NOTE.md

@@ -1,45 +1,67 @@
-Changelog for reva 2.27.0 (2024-12-12)
+Changelog for reva 2.26.8 (2024-12-04)
 =======================================
 
-The following sections list the changes in reva 2.27.0 relevant to
+The following sections list the changes in reva 2.26.8 relevant to
 reva users. The changes are ordered by importance.
 
 Summary
 -------
 
-*   Fix #4985: Drop unneeded session locks
-*   Fix #5000: Fix ceph build
-*   Fix #4989: Deleting OCM share also updates storageprovider
-*   Enh #4998: Emit event when an ocm share is received
-*   Enh #4996: Get rid of some cases of unstructured logging
+*   Fix #4983: Delete stale shares in the jsoncs3 share manager
+*   Fix #4963: Fix name and displayName in an ocm
+*   Fix #4968: Jsoncs3 cache fixes
+*   Fix #4928: Propagate lock in PROPPATCH
+*   Fix #4971: Use manager to list shares
+*   Enh #4978: We added more trace spans in decomposedfs
+*   Enh #4921: Polish propagation related code
 
 Details
 -------
 
-*   Bugfix #4985: Drop unneeded session locks
+*   Bugfix #4983: Delete stale shares in the jsoncs3 share manager
 
-   We no longer lock session metadada files, as they are already written atomically.
+   The jsoncs3 share manager now properly deletes all references to removed shares and shares
+   that belong to a space that was deleted
 
-   https://github.com/cs3org/reva/pull/4985
+   https://github.com/cs3org/reva/pull/4983
+   https://github.com/cs3org/reva/pull/4975
 
-*   Bugfix #5000: Fix ceph build
+*   Bugfix #4963: Fix name and displayName in an ocm
 
-   https://github.com/cs3org/reva/pull/5000
+   Fixed name and displayName in an ocm PROPFIND response
 
-*   Bugfix #4989: Deleting OCM share also updates storageprovider
+   https://github.com/owncloud/ocis/issues/10582
+   https://github.com/cs3org/reva/pull/4963
 
-   When remvoving an OCM share we're now also removing the related grant from the storage
-   provider.
+*   Bugfix #4968: Jsoncs3 cache fixes
 
-   https://github.com/owncloud/ocis/issues/10262
-   https://github.com/cs3org/reva/pull/4989
+   The jsoncs3 share manager now retries persisting if the file already existed and picks up the
+   etag of the upload response in all cases.
 
-*   Enhancement #4998: Emit event when an ocm share is received
+   https://github.com/cs3org/reva/pull/4968
+   https://github.com/cs3org/reva/pull/4532
 
-   https://github.com/owncloud/ocis/issues/10718
-   https://github.com/cs3org/reva/pull/4998
+*   Bugfix #4928: Propagate lock in PROPPATCH
 
-*   Enhancement #4996: Get rid of some cases of unstructured logging
+   Clients using locking (ie. Windows) could not create/copy files over webdav as file seemed to
+   be locked.
 
-   https://github.com/cs3org/reva/pull/4996
+   https://github.com/cs3org/reva/pull/4928
+
+*   Bugfix #4971: Use manager to list shares
+
+   When updating a received share the usershareprovider now uses the share manager directly to
+   list received shares instead of going through the gateway again.
+
+   https://github.com/cs3org/reva/pull/4971
+
+*   Enhancement #4978: We added more trace spans in decomposedfs
+
+   https://github.com/cs3org/reva/pull/4978
+
+*   Enhancement #4921: Polish propagation related code
+
+   We polished some corner cases for propagation that reduce log messages in normal operation.
+
+   https://github.com/cs3org/reva/pull/4921
 

changelog/unreleased/unified-logging.md

@@ -0,0 +1,3 @@
+Enhancement: Get rid of some cases of unstructured logging
+
+https://github.com/cs3org/reva/pull/4996