Commit graph

1960 commits

Author SHA1 Message Date
06kellyjac e544bbe6b3 nerdctl: correct shas to match 0.6.0 2021-02-22 13:18:59 +00:00
github-actions[bot] 227aa2c9b0
Merge master into staging-next 2021-02-22 06:17:05 +00:00
R. RyanTM 17732d2ed3 tilt: 0.18.9 -> 0.18.10 2021-02-21 05:44:40 +00:00
R. RyanTM 2b2772fa0d node-problem-detector: 0.8.6 -> 0.8.7 2021-02-21 01:22:58 +00:00
R. RyanTM a6cff407a2 kubeseal: 0.14.1 -> 0.15.0 2021-02-20 23:39:41 +00:00
R. RyanTM 467dd50cc2 argocd: 1.8.4 -> 1.8.5 2021-02-20 18:08:25 +00:00
github-actions[bot] 4c0670dace
Merge staging-next into staging 2021-02-20 06:17:59 +00:00
Sandro ec6480813d
Merge pull request #113698 from ymatsiuk/fluxcd
fluxcd: 0.8.1 -> 0.8.2
2021-02-20 04:16:35 +01:00
Jan Tojnar 8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
Yurii Matsiuk 8fbe61b9cd
fluxcd: 0.8.1 -> 0.8.2 2021-02-19 14:59:41 +01:00
Ben Siraphob e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
06kellyjac 1f1f14f523 nerdctl: 0.5.0 -> 0.6.0
- nixpkgs-fmt
- add installCheckPhase
- hardcode homepage
- add changelog
- sort meta
2021-02-19 09:55:12 +00:00
Ryan Mulligan 9d7ee4f2e3
Merge pull request #113550 from r-ryantm/auto-update/argo
argo: 2.12.8 -> 2.12.9
2021-02-18 21:07:38 -08:00
Ryan Mulligan d1e1fca53b
Merge pull request #113629 from r-ryantm/auto-update/waypoint
waypoint: 0.2.1 -> 0.2.2
2021-02-18 21:03:45 -08:00
06kellyjac 2dae13180b terragrunt: 0.28.6 -> 0.28.7 2021-02-18 21:20:05 +00:00
Sandro 7fcbe93d4a
Merge pull request #113573 from 06kellyjac/terragrunt
terragrunt: 0.28.5 -> 0.28.6
2021-02-18 21:00:08 +01:00
R. RyanTM 1b18e7d663
fluxctl: 1.21.1 -> 1.21.2 (#113561) 2021-02-18 09:00:52 -10:00
R. RyanTM f107809e6d waypoint: 0.2.1 -> 0.2.2 2021-02-18 18:42:20 +00:00
Yurii Matsiuk 127ada735d
fluxcd: 0.8.0 -> 0.8.1 2021-02-18 15:59:52 +01:00
Sandro 7ec23be044
Merge pull request #99348 from bryanasdev000/package-kubectl-example
kubectl-example: init at 1.0.1
2021-02-18 13:00:21 +01:00
06kellyjac 4ab7e2625b terragrunt: 0.28.5 -> 0.28.6 2021-02-18 08:58:54 +00:00
R. RyanTM beb2617947 argo: 2.12.8 -> 2.12.9 2021-02-18 05:08:15 +00:00
Bryan A. S 1c1aa06927 kubectl-example: init at 1.0.1
Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
2021-02-18 01:36:09 -03:00
Sandro 983f4d6894
Merge pull request #113522 from SuperSandro2000/fix-collection15 2021-02-18 01:45:41 +01:00
Jörg Thalheim 5edaeaf1ab
Merge pull request #113519 from JakDar/argocd-1.8.4
argocd: 1.8.3 -> 1.8.4
2021-02-17 22:55:42 +00:00
Sandro Jäckel 2d11d214c7
nixops: remove unused input 2021-02-17 23:12:28 +01:00
Jakub Darul b073b09a2c argocd: 1.8.3 -> 1.8.4 2021-02-17 22:14:59 +01:00
Diego Rodriguez 84de2a8c31
terraform_0_14: 0.14.6 -> 0.14.7 (#113478) 2021-02-17 09:44:44 -10:00
Sandro 25420cd787
Merge pull request #113379 from 06kellyjac/octant_ver_bump 2021-02-17 13:53:20 +01:00
06kellyjac c1f028c3c9 octant: 0.16.0 -> 0.17.0 2021-02-17 09:05:11 +00:00
06kellyjac 1b8d51e05c octant: refactor
Move octant more inline with recent boundary package
2021-02-17 09:04:31 +00:00
Daniël de Kok 587e027711
Merge pull request #113097 from r-ryantm/auto-update/tilt
tilt: 0.18.8 -> 0.18.9
2021-02-17 09:22:45 +01:00
06kellyjac f420ef7d80 octant: add update script 2021-02-17 08:22:41 +00:00
Jack Kelly 6bad00b75e
terragrunt: 0.28.4 -> 0.28.5 (#113325) 2021-02-16 16:45:50 -08:00
Sandro dc0937f845
Merge pull request #113191 from 06kellyjac/starboard-octant-plugin
starboard-octant-plugin: 0.9.1 -> 0.9.2
2021-02-16 22:04:04 +01:00
Sandro 37fadb2e07
Merge pull request #113182 from 06kellyjac/starboard
starboard: 0.9.1 -> 0.9.2
2021-02-16 08:46:11 +01:00
Bryan A. S 1e3b1f8678
kube-capacity: init at 0.5.1 (#99344)
Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
2021-02-15 22:29:44 -08:00
Ryan Mulligan 50dd350c4c
Merge pull request #112469 from r-ryantm/auto-update/argo
argo: 2.12.7 -> 2.12.8
2021-02-15 08:31:11 -08:00
06kellyjac ebe14573f8 starboard-octant-plugin: 0.9.1 -> 0.9.2 2021-02-15 10:15:39 +00:00
06kellyjac 280af4d80c starboard: 0.9.1 -> 0.9.2 2021-02-15 09:10:52 +00:00
Ryan Mulligan 02212c6622
Merge pull request #112470 from r-ryantm/auto-update/atlantis
atlantis: 0.16.0 -> 0.16.1
2021-02-14 09:32:11 -08:00
R. RyanTM 12bcbda66e tilt: 0.18.8 -> 0.18.9 2021-02-14 08:41:07 +00:00
Ryan Mulligan 29fe61ea01
Merge pull request #112797 from r-ryantm/auto-update/istioctl
istioctl: 1.8.3 -> 1.9.0
2021-02-12 19:30:21 -08:00
Jörg Thalheim 5852a21819
Merge pull request #112755 from 06kellyjac/tektoncd-cli
tektoncd-cli: cleanup
2021-02-12 20:17:47 +00:00
06kellyjac 3270eec8f0 tektoncd-cli: cleanup
- use buildGoModule buildPhase
- let buildGoModule set platform
- add -s -w ldflags for smaller build (-5MB)
- add checkPhase running unit tests
- install man pages in 1 line
- add changelog
- add @vdemeester as a maintainer
2021-02-12 19:50:36 +00:00
Yurii Matsiuk 567ee606e4
fluxcd: 0.7.6 -> 0.8.0 (#112053)
Co-authored-by: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
2021-02-12 10:37:17 -08:00
Sandro 091f73f82c
Merge pull request #112924 from 06kellyjac/starboard-octant-plugin
starboard-octant-plugin: 0.9.0 -> 0.9.1
2021-02-12 18:43:31 +01:00
06kellyjac 5fc6a48de1 starboard-octant-plugin: 0.9.0 -> 0.9.1 2021-02-12 17:18:28 +00:00
06kellyjac d9be8402b8 terragrunt: 0.28.3 -> 0.28.4 2021-02-12 15:34:10 +00:00
R. RyanTM faab7ccd57 kpt: 0.37.1 -> 0.38.0 2021-02-11 18:01:49 +00:00
R. RyanTM deb3aabf3c istioctl: 1.8.3 -> 1.9.0 2021-02-11 17:36:47 +00:00
Jonas Chevalier 8868d8faad
Merge pull request #112789 from flokli/terraform-provider-aws-3.27.0
terraform-providers.aws: 3.20.0 -> 3.27.0
2021-02-11 16:18:49 +00:00
Florian Klink e8d1fec763
Merge pull request #112642 from IMIO/feat/update-vsphere-terraform-provider
terraform-providers.vsphere: 1.18.3 -> 1.24.3
2021-02-11 17:07:44 +01:00
Florian Klink 7eb298cad0
Merge pull request #112692 from IMIO/feat/update-elasticsearch-terraform-provider
terraform-providers.elasticsearch: 0.7.0 -> 1.5.2
2021-02-11 17:07:08 +01:00
Florian Klink da6ef8805f
Merge pull request #112696 from IMIO/feat/update-rabbitmq-terraform-provider
terraform-providers.rabbitmq: 1.3.0 -> 1.5.1
2021-02-11 17:06:39 +01:00
Florian Klink 33c584b141 terraform-providers.aws: 3.20.0 -> 3.27.0 2021-02-11 17:03:27 +01:00
06kellyjac d4cc1b902a starboard: 0.9.0 -> 0.9.1 2021-02-11 09:17:20 +00:00
Jean-François Roche c84a1bb65e
terraform-providers.rabbitmq: 1.3.0 -> 1.5.1
Update the provider for rabbitmq with the latest version
2021-02-11 00:59:08 +01:00
Jean-François Roche b2071f5035
terraform-providers.elasticsearch: 0.7.0 -> 1.5.2
Define provider in `providers.json`.
Remove custom build for terraform provider.
2021-02-11 00:13:25 +01:00
06kellyjac 2a5b91dd76 terragrunt: 0.28.2 -> 0.28.3 2021-02-10 15:28:40 +00:00
Ryan Mulligan 3530d374b6
Merge pull request #112544 from r-ryantm/auto-update/velero
velero: 1.5.2 -> 1.5.3
2021-02-10 07:17:22 -08:00
Jean-François Roche 438878d2d7
terraform-providers.vsphere: 1.18.3 -> 1.24.3
We define the provider source address using the terraform registry.

This is a breaking change as reference in user required_providers will have to change from `nixpkgs/vsphere` to `hashicorp/vsphere`.
2021-02-10 12:30:42 +01:00
Mario Rodas c8b29f075f
Merge pull request #112575 from 06kellyjac/kube3d
kube3d: 4.1.1 -> 4.2.0
2021-02-09 19:21:12 -05:00
Sandro 8d7a505faf
Merge pull request #112233 from maxeaubrey/nomad_bump 2021-02-10 00:44:11 +01:00
06kellyjac b30013757b kube3d: 4.1.1 -> 4.2.0 2021-02-09 20:11:37 +00:00
R. RyanTM bf28a76221 velero: 1.5.2 -> 1.5.3 2021-02-09 17:55:40 +00:00
Ryan Mulligan d3ecefc764
Merge pull request #112505 from r-ryantm/auto-update/istioctl
istioctl: 1.8.2 -> 1.8.3
2021-02-09 06:28:01 -08:00
R. RyanTM cc2ba12b10 istioctl: 1.8.2 -> 1.8.3 2021-02-09 11:14:18 +00:00
06kellyjac ff549960f8 tektoncd-cli: 0.15.0 -> 0.16.0 2021-02-09 09:13:01 +00:00
R. RyanTM 4173245c2e atlantis: 0.16.0 -> 0.16.1 2021-02-09 06:25:34 +00:00
R. RyanTM 2cb3d3be8a argo: 2.12.7 -> 2.12.8 2021-02-09 06:17:43 +00:00
Mario Rodas e47a837690
Merge pull request #111788 from r-ryantm/auto-update/node-problem-detector
node-problem-detector: 0.8.5 -> 0.8.6
2021-02-08 21:16:38 -05:00
Mario Rodas 6d4bbbe267
Merge pull request #112206 from r-ryantm/auto-update/tanka
tanka: 0.12.0 -> 0.14.0
2021-02-08 20:31:05 -05:00
Mario Rodas 236c3a240c
Merge pull request #112226 from r-ryantm/auto-update/tilt
tilt: 0.18.5 -> 0.18.8
2021-02-08 20:11:43 -05:00
Sandro 86d14b6037
Merge pull request #112148 from 06kellyjac/waypoint
waypoint: 0.2.0 -> 0.2.1
2021-02-08 17:49:03 +01:00
Ryan Mulligan 9d8d0e66e0
Merge pull request #112314 from r-ryantm/auto-update/helm
kubernetes-helm: 3.4.2 -> 3.5.2
2021-02-08 05:40:47 -08:00
Sandro 0111346762
Merge pull request #112284 from urbas/terraform-shell-provider-simplify
terraform-providers.shell: uses default model
2021-02-08 10:12:12 +01:00
Jörg Thalheim 6fea96cbd0
Merge pull request #112141 from r-ryantm/auto-update/helmfile
helmfile: 0.138.2 -> 0.138.4
2021-02-07 20:07:43 +00:00
06kellyjac d4ed7e3d6c waypoint: 0.2.0 -> 0.2.1
- General cleanup
- Restructured so make bin succeeds
- No need to destribute waypoint-entrypoint
2021-02-07 17:00:41 +00:00
Mario Rodas 2b33d7ee4c
Merge pull request #112301 from 06kellyjac/master
kube3d: 4.1.0 -> 4.1.1
2021-02-07 11:24:19 -05:00
R. RyanTM 9588338aac kubernetes-helm: 3.4.2 -> 3.5.2 2021-02-07 16:12:49 +00:00
Ryan Mulligan 5491a4f8e9
Merge pull request #112193 from r-ryantm/auto-update/stern
stern: 1.13.1 -> 1.14.0
2021-02-07 08:04:47 -08:00
06kellyjac 50457fa4de kube3d: 4.1.0 -> 4.1.1 2021-02-07 12:33:37 +00:00
Matej Urbas a9e03c40a1 terraform-providers.shell: uses default model 2021-02-07 10:37:09 +00:00
Ryan Mulligan 2be02581fb
Merge pull request #112217 from r-ryantm/auto-update/terraform-provider-lxd
terraform-providers.lxd: 1.4.0 -> 1.5.0
2021-02-06 16:59:03 -08:00
Maxine Aubrey 8ae4b1be1c
nomad_0_11: drop
appears upstream has dropped support as fixes for CVE-2021-3283 were not
backported
2021-02-06 23:45:04 +01:00
Maxine Aubrey 94365804d0
nomad_1_0: 1.0.2 -> 1.0.3 2021-02-06 23:44:17 +01:00
Maxine Aubrey 901e1ea7db
nomad_0_12: 0.12.9 -> 0.12.10 2021-02-06 23:43:58 +01:00
R. RyanTM 07bbbc64ee tilt: 0.18.5 -> 0.18.8 2021-02-06 22:18:12 +00:00
R. RyanTM a4efb7fe77 terragrunt: 0.28.1 -> 0.28.2 2021-02-06 21:36:07 +00:00
R. RyanTM 721c2f9f0a terraform-providers.lxd: 1.4.0 -> 1.5.0 2021-02-06 21:31:43 +00:00
R. RyanTM e4e8f908a3 tanka: 0.12.0 -> 0.14.0 2021-02-06 20:57:06 +00:00
R. RyanTM ec6b0f81c3 stern: 1.13.1 -> 1.14.0 2021-02-06 20:02:47 +00:00
R. RyanTM 96c451192d helmfile: 0.138.2 -> 0.138.4 2021-02-06 13:04:05 +00:00
R. RyanTM 8c0e0ef058 cni-plugins: 0.9.0 -> 0.9.1 2021-02-06 09:28:30 +00:00
Sandro 12e7e446d0
Merge pull request #112074 from 06kellyjac/kube3d
kube3d: 4.0.0 -> 4.1.0
2021-02-05 22:45:07 +01:00
06kellyjac 73f62a6ad3 kube3d: 4.0.0 -> 4.1.0 2021-02-05 20:35:54 +00:00
Sandro Jäckel 0c9db04497
k3s: Avoid string conversion 2021-02-05 12:51:21 +01:00
Diego Rodriguez ead24f04b0
terraform_0_14: 0.14.5 -> 0.14.6 (#111971) 2021-02-05 01:02:47 +00:00
Ricardo Guevara 89136c1dce
terraform-provider-kafka: init at v0.2.12 (#111301) 2021-02-04 13:28:43 -08:00
Sander van der Burg b32335b3bd
Merge pull request #110813 from svanderburg/node2nix-update
nodePackages: regenerate with node2nix 1.9.0
2021-02-04 09:15:23 +01:00
Ryan Mulligan 04d5f1e3a8
Merge pull request #111724 from r-ryantm/auto-update/argo
argo: 2.12.6 -> 2.12.7
2021-02-03 18:50:36 -08:00
Ryan Mulligan 68323cae4e
Merge pull request #111763 from r-ryantm/auto-update/helmfile
helmfile: 0.138.1 -> 0.138.2
2021-02-03 12:00:39 -08:00
Sander van der Burg 84a097848e regenerate with node2nix 1.9.0 except zigbee2mqtt 2021-02-03 19:52:09 +01:00
R. RyanTM 2cfab8b61c node-problem-detector: 0.8.5 -> 0.8.6 2021-02-03 18:10:45 +00:00
adisbladis a2a05d2bfe
nixopsUnstable: 1.7pre2764_932bf4 -> 2.0.0-pre 2021-02-03 16:03:03 +01:00
R. RyanTM a30a844f31 helmfile: 0.138.1 -> 0.138.2 2021-02-03 14:43:11 +00:00
R. RyanTM 011f14738b argo: 2.12.6 -> 2.12.7 2021-02-03 09:51:03 +00:00
Sandro 9724b68951
Merge pull request #111665 from ymatsiuk/fluxcd
fluxcd: 0.7.5 -> 0.7.6
2021-02-02 22:40:41 +01:00
Sandro 99a69d3fbe
Merge pull request #111664 from 06kellyjac/terragrunt 2021-02-02 22:40:20 +01:00
06kellyjac de58595c5d terragrunt: 0.28.0 -> 0.28.1 2021-02-02 17:55:15 +00:00
Yurii Matsiuk cebfb4acd1
fluxcd: 0.7.5 -> 0.7.6 2021-02-02 17:42:51 +01:00
06kellyjac cb2949a512 terragrunt: 0.27.4 -> 0.28.0 2021-02-02 16:35:28 +00:00
Sandro Jäckel 6ad10c3bcd
treewide: Remove doBuild cause it does not exist 2021-02-02 14:46:06 +01:00
Sandro 1755b9d929
Merge pull request #111606 from ymatsiuk/fluxcd
fluxcd: 0.7.4 -> 0.7.5
2021-02-02 00:35:00 +01:00
Yurii Matsiuk c2f66f8f53
fluxcd: 0.7.4 -> 0.7.5 2021-02-01 21:19:44 +01:00
Sandro 4519d75b3f
Merge pull request #111584 from 06kellyjac/terragrunt
terragrunt: 0.27.3 -> 0.27.4
2021-02-01 19:35:28 +01:00
Jack Kelly 04b739029c
terragrunt: add to the meta (#111586)
* terragrunt: add to the meta

* Update pkgs/applications/networking/cluster/terragrunt/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-02-01 18:05:54 +01:00
06kellyjac 155a45d8df terragrunt: 0.27.3 -> 0.27.4 2021-02-01 16:04:17 +00:00
Yurii Matsiuk 70eba9747a
fluxcd: 0.7.3 -> 0.7.4 2021-02-01 15:23:38 +01:00
Robert Scott 1e01f697c2 cloudfoundry-cli: relocate to pkgs/applications/networking/cluster 2021-01-31 16:30:23 +00:00
Guillaume Girol e20fa5f1fb
Merge pull request #111173 from bhipple/u/luigi
luigi: remove dependency override on tornado_5
2021-01-30 18:18:20 +00:00
Mario Rodas f3627f8cf0
Merge pull request #111290 from r-ryantm/auto-update/kubeseal
kubeseal: 0.13.1 -> 0.14.1
2021-01-30 10:21:31 -05:00
R. RyanTM cea59fd3a9 kubeseal: 0.13.1 -> 0.14.1 2021-01-30 11:13:27 +00:00
Jörg Thalheim fd2dcf3b17
Merge pull request #111247 from siraben/stdenv-lib-node-env
pkgs/development: stdenv.lib -> lib in node-composition files
2021-01-30 08:40:47 +00:00
Ben Siraphob 32fc8b9134 pkgs/development: stdenv.lib -> lib in node-composition files
Future updates to these files should generate them with node2nix 1.9.0
which removes stdenv.lib from the generated Nix.
2021-01-30 14:42:17 +07:00
R. RyanTM a5df15db6f
kubecfg: 0.16.0 -> 0.17.0 (#111115) 2021-01-30 00:28:42 -05:00
Sandro 2adfe776b1
Merge pull request #111032 from ivankovnatsky/patch-11
terraform-providers.gitlab: 3.1.0 -> 3.4.0
2021-01-30 02:23:01 +01:00
Diego Rodriguez eb41c40eb0
minikube: 1.17.0 -> 1.17.1 2021-01-29 15:49:18 -07:00
Benjamin Hipple bf903ddb3f luigi: remove dependency override on tornado_5
When building luigi on python3, upstream supports the latest tornado
2021-01-29 11:39:06 -05:00
Ivan Kovnatsky 34fc426ff1
terraform-providers.gitlab: 3.1.0 -> 3.4.0 2021-01-29 11:59:13 +02:00
Mario Rodas 9c19775496
Merge pull request #111109 from r-ryantm/auto-update/helmfile
helmfile: 0.137.0 -> 0.138.1
2021-01-28 23:39:04 -05:00
Mario Rodas 98cd7e6614
Merge pull request #111110 from r-ryantm/auto-update/helmsman
helmsman: 3.6.3 -> 3.6.4
2021-01-28 23:36:40 -05:00
R. RyanTM 3015caee00 helmsman: 3.6.3 -> 3.6.4 2021-01-29 04:07:19 +00:00
R. RyanTM d136928c48 helmfile: 0.137.0 -> 0.138.1 2021-01-29 04:03:21 +00:00
R. RyanTM 987ca6e675 argo: 2.12.5 -> 2.12.6 2021-01-28 21:46:06 +00:00
Sandro 7fc66ee9a4
Merge pull request #110945 from 06kellyjac/starboard-octant-plugin 2021-01-28 00:06:34 +01:00
06kellyjac d8aa0fda58 starboard-octant-plugin: 0.8.0 -> 0.9.0 2021-01-27 15:57:07 +00:00
06kellyjac 1a9e4e109b starboard-octant-plugin: remove unused dependency and compile smaller
Added -s and -w ldflags to minify starboard-octant-plugin
2021-01-27 15:57:07 +00:00
Yurii Matsiuk a2ac3c2f58
fluxcd: 0.6.3 -> 0.7.3 2021-01-27 16:09:39 +01:00
06kellyjac 9d9f863aa5 starboard: 0.8.0 -> 0.9.0 2021-01-26 19:46:15 +00:00
06kellyjac 135807629f terragrunt: 0.27.1 -> 0.27.3 2021-01-26 15:42:50 +00:00
06kellyjac ca1bc75f9f terragrunt: remove unused dependency and compile smaller
Removed makeWrapper as it's been unused since we stopped wrapping up TF
Added -s and -w ldflags to minify terragrunt
2021-01-26 15:41:11 +00:00
Sandro 5d453c87a9
Merge pull request #110817 from dbirks/tilt-0.18.5
tilt: 0.18.1 -> 0.18.5
2021-01-25 23:19:00 +01:00
David Birks 92365d5dbc
tilt: 0.18.1 -> 0.18.5 2021-01-25 15:21:11 -05:00
Sandro 41adb8acc1
Merge pull request #110782 from dotlambda/flink-1.12.1 2021-01-25 21:18:28 +01:00
Pavol Rusnak a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Robert Schütz 8573814f46 flink: 1.11.3 -> 1.12.1 2021-01-25 16:24:25 +01:00
Robert Schütz f7129e8cbc flink: 1.11.1 -> 1.11.3
addresses CVE-2020-17518 and CVE-2020-17519
2021-01-25 16:22:01 +01:00
Robert Schütz e912b8e116 flink_1_5: drop
It suffers from CVE-2020-17518.
2021-01-25 16:20:18 +01:00