rpms/torque
7
0
Fork 0
Code Issues Pull Requests Releases Activity

do this just to commit the broken stuff

Browse Source
This commit is contained in:
David Brown 2014-10-14 22:56:44 -07:00
parent 26c96b6a60
commit f4f149069f
4 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,10 +1,8 @@
/torque-2.5.2.tar.gz
/torque-2.5.3.tar.gz
<<<<<<< HEAD
/torque-2.5.4.tar.gz
/torque-2.5.5.tar.gz
/torque-2.5.7.tar.gz
=======
/torque-3.0.0.tar.gz
/torque-3.0.0-snap.201102011355.tar.gz
/torque-3.0.1.tar.gz
@ -13,4 +11,3 @@
/torque-3.0.4.tar.gz
/torque-4.2.6.1.tar.gz
/torque-4.2.8.tar.gz
>>>>>>> master

4
sources
View File

@ -1,5 +1 @@
<<<<<<< HEAD
aa033adc22df8ab333e5014dd93754b6 torque-2.5.7.tar.gz
=======
3dd4348f54ba236ee7c208cc6b97f674 torque-4.2.8.tar.gz
>>>>>>> master

8
torque-munge-size.patch
View File

@ -18,17 +18,10 @@ index 6d32c8b..06b1bec 100644
--- a/src/include/libpbs.h
+++ b/src/include/libpbs.h
@@ -121,7 +121,7 @@
>>>>>>> master
#define EOF -1
#endif
-#define MUNGE_SIZE 256 /* I do not know what the proper size of this should be. My
<<<<<<< HEAD
+#define MUNGE_SIZE 1024 /* I do not know what the proper size of this should be. My
testing with munge shows it creates a string of 128 bytes */
/* enums for standard job files (sync w/TJobFileType[]) */
=======
+#define MUNGE_SIZE 1024 /* I do not know what the proper size of this should be. My
testing with munge shows it creates a string of 128 bytes */
@ -36,4 +29,3 @@ index 6d32c8b..06b1bec 100644
--
1.8.4.2
>>>>>>> master

10
torque.spec
View File

@ -876,11 +876,11 @@ fi
* Mon Sep 19 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.7-3
- Add --with-tcp-retry-limit=2 to build, rhbz#738576.
* Tue Aug 30 2011 Steve Traylen <steve.traylen@cern.ch> - 3.0.2-2
* Wed Aug 31 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.7-2
- Move checkpoint directory from torque-mom to torque package.
rhbz#734878.
* Wed Aug 30 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.7-2
* Tue Aug 30 2011 Steve Traylen <steve.traylen@cern.ch> - 3.0.2-2
- Move checkpoint directory from torque-mom to torque package.
rhbz#734878.
@ -890,9 +890,6 @@ fi
pbs_gpureset.
- Add or rather force munge support, Add torque-munge-size.patch.
* Sun Jun 26 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.5-3
- Removes nodes database file from package rhbz#716659
* Mon Jun 27 2011 Steve Traylen <steve.traylen@cern.ch> - 3.0.2-1
- Update to 3.0.2.
- Remove torque-buffer-overrun since upstream now.
@ -900,6 +897,9 @@ fi
* Sun Jun 26 2011 Steve Traylen <steve.traylen@cern.ch> - 3.0.1-4
- Removes nodes database file from package rhbz#716659
* Sun Jun 26 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.5-3
- Removes nodes database file from package rhbz#716659
* Fri Jun 17 2011 Steve Traylen <steve.traylen@cern.ch> - 3.0.1-3
- Add torque-munge-size.patch, rhbz#713996, Alex Chernyakhovsky