Commit graph

1060 commits

Author SHA1 Message Date
85af3e3578 Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!23
2022-05-12 19:37:43 +00:00
4d1384546a updating squid service 2022-05-12 21:37:19 +02:00
ce0c835c2a Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!22
2022-05-12 19:19:44 +00:00
0211dc997d updating squid service 2022-05-12 21:11:38 +02:00
6c99d1c70a Merge branch 'devel' into 'main'
updating squid service. correcting chown

See merge request glicid-public/guix-glicid!21
2022-05-12 09:43:43 +00:00
0617046a08
updating squid service. correcting chown 2022-05-12 11:43:14 +02:00
160cf37f0b Merge branch 'devel' into 'main'
updating squid service. correcting loglevel param not passed to service

See merge request glicid-public/guix-glicid!20
2022-05-12 08:48:09 +00:00
7da0faa2f0
updating squid service. correcting loglevel param not passed to service 2022-05-12 10:47:52 +02:00
2e1e228ad5 Merge branch 'devel' into 'main'
updating squid service.

See merge request glicid-public/guix-glicid!19
2022-05-12 08:40:42 +00:00
9c25ec77bd
updating squid service. correcting module import 2022-05-12 10:36:09 +02:00
27083fb562
updating squid config 2022-05-12 10:33:22 +02:00
5bfb43c149 Merge branch 'devel' into 'main'
Update parallel.scm

See merge request glicid-public/guix-glicid!18
2022-05-11 19:48:37 +00:00
bfe498bb09 Update parallel.scm 2022-05-11 19:47:54 +00:00
cdfbb8b281 Merge branch 'devel' into 'main'
wrong checksum

See merge request glicid-public/guix-glicid!17
2022-05-11 15:24:55 +00:00
ffc596c258 wrong checksum 2022-05-11 17:24:25 +02:00
0955f5ad07 Merge branch 'devel' into 'main'
new checksum

See merge request glicid-public/guix-glicid!16
2022-05-11 15:17:35 +00:00
fd664b6d15 new checksum 2022-05-11 17:16:45 +02:00
8b80892047 Merge branch 'devel' into 'main'
modif version slurm

See merge request glicid-public/guix-glicid!15
2022-05-11 14:58:15 +00:00
4ee4d8b47d modif version slurm 2022-05-11 16:55:48 +02:00
25b199e121 Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!14
2022-05-11 10:16:54 +00:00
bc5636ce0a
updating squid service 2022-05-11 12:15:13 +02:00
623b1ee869 Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!13
2022-05-11 08:21:18 +00:00
9d72306b72
updating squid service 2022-05-11 10:19:44 +02:00
a21b2068c5 Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!12
2022-05-11 08:11:43 +00:00
5fff9e7cab
updating squid service 2022-05-11 10:11:11 +02:00
2e21ea4985 Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!11
2022-05-11 07:28:50 +00:00
01c19423c3
updating squid service 2022-05-11 09:28:12 +02:00
09e33dabb1 Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!10
2022-05-11 07:19:08 +00:00
1001ba6a46
updating squid service 2022-05-11 09:16:01 +02:00
5baad8a194
updating squid service 2022-05-10 16:14:04 +02:00
086a91dfa5
updating squid service 2022-05-10 15:33:46 +02:00
a0d44730df Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!9
2022-05-10 12:47:07 +00:00
b1b8b9d036
updating squid service 2022-05-10 14:46:41 +02:00
9bec2582a8 Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!8
2022-05-10 12:26:59 +00:00
9ae51b11e4
updating squid service 2022-05-10 14:17:54 +02:00
2b8ef863f5 Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!7
2022-05-10 12:04:21 +00:00
0ce7085c56
updating squid service 2022-05-10 14:03:52 +02:00
feb67a334b Merge branch 'devel' into 'main'
updating squid service

See merge request glicid-public/guix-glicid!6
2022-05-10 11:43:46 +00:00
9dbd68cfd0
updating squid service 2022-05-10 13:42:28 +02:00
37a943ab19 Merge branch 'devel' into 'main'
update of squid service

See merge request glicid-public/guix-glicid!5
2022-05-10 11:22:13 +00:00
86f4780b7e
Merge branch 'devel' of gitlab.univ-nantes.fr:glicid-public/guix-glicid into devel 2022-05-10 13:16:05 +02:00
94bb98d6af
updating squid service 2022-05-10 13:15:54 +02:00
143e6ffa75 Merge branch 'devel' into 'main'
rework of devel and first try of new workflow

See merge request glicid-public/guix-glicid!4
2022-05-10 08:41:48 +00:00
b17c01b30e Merge branch 'main' into 'devel'
# Conflicts:
#   README.md
2022-05-10 08:41:35 +00:00
499633feb4 Update README.md 2022-05-10 08:38:10 +00:00
7ce1527394
backporting master into devel (devel was behind master) 2022-05-10 10:06:44 +02:00
631c38ee0c
deleting README.adoc 2022-05-10 10:02:05 +02:00
54560ad0ea
backporting master into devel (devel was behind master) 2022-05-10 10:00:46 +02:00
1deab89c40
adding all version from 2.4.57 defined in guix master 2022-05-09 14:12:57 +02:00
85a9c47fab
correcting version for openldap 2022-05-09 13:50:35 +02:00