Merge branch 'master' of ssh://pkgs.fedoraproject.org/torque

Conflicts:
	torque.spec
This commit is contained in:
David Brown 2015-06-29 18:31:19 -07:00
commit 4dc07ab1c1

View File

@ -71,7 +71,7 @@
Name: torque
Version: 4.2.10
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop
@ -892,6 +892,9 @@ fi
%endif
%changelog
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat Jun 6 2015 David Brown <david.brown@pnnl.gov> - 4.2.10-4
- Bugfix - #1227003 test system in cluster environment
- Bugfix - #1216049 add --enable-cpuset and hwloc