Merge branch 'master' into document-architecture

This commit is contained in:
Jörn Friedrich Dreyer
2021-04-29 18:08:53 +02:00
committed by GitHub
181 changed files with 4245 additions and 5624 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ To release a new version of the storage submodule, you have to follow a few simp
## Preparation
1. Before releasing, make sure that reva has been [updated to the desired version]({{< ref "updating.md" >}})
1. Before releasing, make sure that reva has been [updated to the desired version]({{< ref "updating" >}})
## Release
1. Check out master
+1 -1
View File
@@ -15,5 +15,5 @@ geekdocFilePath: updating.md
2. Create a changelog entry containing changes that were done in [reva](https://github.com/cs3org/reva/commits/master)
3. Create a Pull Request to ocis-reva master with those changes
4. If test issues appear, you might need to adjust the tests
5. After the PR is merged, consider doing a [release of the storage submodule]({{< ref "releasing.md" >}})
5. After the PR is merged, consider doing a [release of the storage submodule]({{< ref "releasing" >}})
+1 -1
View File
@@ -28,7 +28,7 @@ export STORAGE_USERS_DRIVER=json
export STORAGE_USERS_JSON=/path/to/users.json
```
For the format of the users.json have a look at the [reva examples](https://github.com/cs3org/reva/blob/master/examples/separate/users.demo.json)
For the format of the users.json have a look at the [reva examples](https://github.com/cs3org/reva/blob/master/examples/oc-phoenix/users.demo.json)
### LDAP driver