Merge branch 'master' into update-deps-2020-07-22

.drone.star

@@ -1,7 +1,7 @@
 config = {
   'apiTests': {
     'coreBranch': 'master',
-    'coreCommit': 'aa87e9c07c5558387c37921d850e8d8e99d6cd45',
+    'coreCommit': 'f0fd17a01c69c7c5b518d3209afe8f3e4feac1ef',
     'numberOfParts': 2
   },
   'uiTests': {

CHANGELOG.md

@@ -12,6 +12,7 @@
 * Change - Start ocis-proxy with the ocis server command: [#119](https://github.com/owncloud/ocis/issues/119)
 * Change - Update reva config: [#336](https://github.com/owncloud/ocis/pull/336)
 * Enhancement - Document how to run OCIS on top of EOS: [#172](https://github.com/owncloud/ocis/pull/172)
+* Enhancement - Simplify tracing config: [#92](https://github.com/owncloud/product/issues/92)
 * Enhancement - Add new REVA config variables to docs: [#345](https://github.com/owncloud/ocis/pull/345)
 * Enhancement - Update extensions: [#180](https://github.com/owncloud/ocis/pull/180)
 * Enhancement - Update extensions 2020-07-01: [#357](https://github.com/owncloud/ocis/pull/357)
@@ -110,6 +111,15 @@
    https://github.com/owncloud/ocis/pull/172
 
 
+* Enhancement - Simplify tracing config: [#92](https://github.com/owncloud/product/issues/92)
+
+   We now apply the oCIS tracing config to all services which have tracing. With this it is possible
+   to set one tracing config for all services at the same time.
+
+   https://github.com/owncloud/product/issues/92
+   https://github.com/owncloud/ocis/pull/329
+
+
 * Enhancement - Add new REVA config variables to docs: [#345](https://github.com/owncloud/ocis/pull/345)
 
    With the default setup of running oCIS with ocis-proxy we need to set `REVA_DATAGATEWAY_URL`

tests/acceptance/expected-failures.txt

@@ -172,6 +172,11 @@ apiShareManagementBasic/createShare.feature:195
 apiShareManagementBasic/createShare.feature:417
 apiShareManagementBasic/createShare.feature:418
 #
+# https://github.com/owncloud/ocis-reva/issues/243 Sharing seems to work but does not work
+# https://github.com/owncloud/ocis-reva/issues/372 Listing shares via ocs API does not show path for parent folders
+apiShareManagementBasic/createShare.feature:269
+apiShareManagementBasic/createShare.feature:270
+#
 # https://github.com/owncloud/ocis-reva/issues/356 Fields missing in delete share OCS response
 apiShareManagementBasic/deleteShare.feature:36
 apiShareManagementBasic/deleteShare.feature:37