Merge branch 'slurm-2.5' of https://github.com/SchedMD/slurm into slurm-2.5

NEWS

@@ -13,6 +13,7 @@ documents those changes that are of interest to users and admins.
  -- Handle srun task launch failure without duplicate error messages or abort.
  -- Fix bug in QoS limits enforcement when slurmctld restarts and user not yet
     added to the QOS list.
+ -- Fix issue where sjstat and sjobexitmod was installed in 2 different rpms
 
 * Changes in SLURM 2.5.1
 ========================

slurm.spec

@@ -584,6 +584,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,0755)
 %{_mandir}/../doc
 %{_bindir}/s*
+%exclude %{_bindir}/sjobexitmod
+%exclude %{_bindir}/sjstat
 %{_sbindir}/slurmctld
 %{_sbindir}/slurmd
 %{_sbindir}/slurmstepd