Skip to content
Snippets Groups Projects
Commit 840374b2 authored by Brian Christiansen's avatar Brian Christiansen
Browse files

Merge remote-tracking branch 'origin/slurm-14.11' into slurm-15.08 

Conflicts:
	etc/slurmd.service.in
parents fbe74680 508f866e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NEWS
+ 1
− 0
View file @ 840374b2
......@@ -544,6 +544,7 @@ documents those changes that are of interest to users and administrators.
* Changes in Slurm 14.11.11
===========================
-- Fix systemd's slurmd service from killing slurmstepds on shutdown.
* Changes in Slurm 14.11.10
===========================
......
etc/slurmd.service.in
+ 1
− 0
View file @ 840374b2
......@@ -7,6 +7,7 @@ ConditionPathExists=@sysconfdir@/slurm.conf
Type=forking
ExecStart=@sbindir@/slurmd
PIDFile=/var/run/slurmd.pid
KillMode=process
[Install]
WantedBy=multi-user.target
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung