Merge branch 'master' into 'proposal_julien'

# Conflicts:
#   docs/index.md

docs/index.md

@@ -21,7 +21,7 @@ The rota starts on Friday at 17:30 and finishes on the next Friday too at the sa
 !!! note ""
     On Thursday, first release to production, then to testing, otherwise you will have to make sure test updates from the same day do not end up in production
 
-## 2020 Schedule 
+## 2020 Schedule
 
 | Who?          | When?                 | Comments?     |
 | ------------- | --------------------- | ------------- |
@@ -54,11 +54,11 @@ The rota starts on Friday at 17:30 and finishes on the next Friday too at the sa
 | Daniel        | 04 Jul to 10 Jul 2020 |               |
 | Dabadaba      | 11 Jul to 17 Jul 2020 |               |
 | Ulrich        | 18 Jul to 24 Jul 2020 |               |
-| Alex          | 25 Jul to 31 Jul 2020 |               |
+| Daniel        | 25 Jul to 31 Jul 2020 |               |
 | Ben           | 01 Aug to 07 Aug 2020 |               |
 | Ben           | 08 Aug to 14 Aug 2020 |               |
 | Alex          | 15 Aug to 21 Aug 2020 |               |
-| Daniel        | 22 Aug to 28 Aug 2020 |               |
+| Alex          | 22 Aug to 28 Aug 2020 |               |
 | Dabadaba      | 29 Aug to 04 Sep 2020 |               |
 | Ulrich        | 05 Sep to 11 Sep 2020 |               |
 | Ben           | 12 Sep to 18 Sep 2020 |               |

docs/resources/resources.md

@@ -41,6 +41,6 @@
 
 ## CephFS shares
 
-* Linuxsoft:/mnt/data1: https://filer-carbon.cern.ch/grafana/d/000000111/cephfs-detail?orgId=1&refresh=1m&fullscreen&panelId=15&from=now-90d&to=now&var-cluster=flax&var-share=303fadd2-188b-4d27-984b-cc91bdfbbb73
-* Linuxsoft:/mnt/data2: /mnt/data2: https://filer-carbon.cern.ch/grafana/d/000000111/cephfs-detail?orgId=1&refresh=1m&fullscreen&panelId=15&from=now-90d&to=now&var-cluster=flax&var-share=0d0757df-6220-4a27-81e7-51a38cd7ecdc
-* Koji:/koji: https://filer-carbon.cern.ch/grafana/d/000000111/cephfs-detail?orgId=1&refresh=1m&var-cluster=flax&var-share=f51e1a94-b1ff-4f2c-9686-c7e9835e0f6c&fullscreen&panelId=15&from=now-90d&to=now
+* Linuxsoft [/mnt/data1](https://filer-carbon.cern.ch/grafana/d/000000111/cephfs-detail?orgId=1&refresh=1m&fullscreen&panelId=15&from=now-90d&to=now&var-cluster=flax&var-share=303fadd2-188b-4d27-984b-cc91bdfbbb73)
+* Linuxsoft [/mnt/data2](https://filer-carbon.cern.ch/grafana/d/000000111/cephfs-detail?orgId=1&refresh=1m&fullscreen&panelId=15&from=now-90d&to=now&var-cluster=flax&var-share=0d0757df-6220-4a27-81e7-51a38cd7ecdc)
+* Koji [/koji](https://filer-carbon.cern.ch/grafana/d/000000111/cephfs-detail?orgId=1&refresh=1m&var-cluster=flax&var-share=f51e1a94-b1ff-4f2c-9686-c7e9835e0f6c&fullscreen&panelId=15&from=now-90d&to=now)