[torque/f15: 7/7] New upstream.

[stevetraylen]

commit 617ef20e71a0e3962d3fa65011094885314cd8c4
Merge: 3f0656d 13d785b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Jan 11 18:36:20 2012 +0100

    New upstream.

 .gitignore                           |    2 +
 sources                              |    2 +-
 torque-buffer-overrun.patch          |  119 ----------------------------------
 torque-initd-hangs-rhbz-744138.patch |   19 ++++++
 torque.spec                          |   33 +++++++--
 5 files changed, 48 insertions(+), 127 deletions(-)
---
diff --cc torque.spec
index 2d31109,8e4106f..9fd236c
--- a/torque.spec
+++ b/torque.spec
@@@ -70,8 -70,8 +70,8 @@@
  %global server_nameflags --with-default-server=%{server_name}
  
  Name:        torque
- Version:     3.0.1
- Release:     5%{?dist}
+ Version:     3.0.3
 -Release:     2%{?dist}
++Release:     1%{?dist}
  Summary:     Tera-scale Open-source Resource and QUEue manager
  Source0:     http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
  Source2:     xpbs.desktop
@@@ -785,10 -790,26 +790,24 @@@ f
  %endif
  
  %changelog
- * Wed Aug 30 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-5
 -* Thu Nov 17 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.3-2
 -- Empty release for release mistake.
 -
 -* Thu Nov 17 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.3-1
++* Wed Jan 11 2012 Steve Traylen <steve.traylen at cern.ch> - 3.0.3-1
+ - New upstream.
+ 
+ * Sun Oct  9 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-4
+ - Add patch torque-initd-hangs-rhbz-744138.patch
+ 
+ * Mon Sep 19 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-3
+ - Add --with-tcp-retry-limit=2 to build, rhbz#738576.
+ 
+ * Wed Aug 30 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-2
  - Move checkpoint directory from torque-mom to torque package.
    rhbz#734878.
  
+ * Mon Jun 27 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.2-1
+ - Update to 3.0.2.
+ - Remove torque-buffer-overrun since upstream now.
+ 
++>>>>>>> master
  * Sun Jun 26 2011 Steve Traylen <steve.traylen at cern.ch> - 3.0.1-4
  - Removes nodes database file from package rhbz#716659