Merge branch 'master' of http://github.com/SchedMD/slurm
Conflicts: configure
No related branches found
No related tags found
Showing
- NEWS 6 additions, 4 deletionsNEWS
- RELEASE_NOTES 2 additions, 4 deletionsRELEASE_NOTES
- auxdir/x_ac_cray.m4 1 addition, 1 deletionauxdir/x_ac_cray.m4
- configure 2 additions, 1 deletionconfigure
- configure.ac 1 addition, 0 deletionsconfigure.ac
- doc/html/news.shtml 6 additions, 1 deletiondoc/html/news.shtml
- doc/html/preempt.shtml 5 additions, 24 deletionsdoc/html/preempt.shtml
- doc/man/man5/slurm.conf.5 30 additions, 0 deletionsdoc/man/man5/slurm.conf.5
- slurm.spec 36 additions, 21 deletionsslurm.spec
- slurm/slurm.h.in 3 additions, 2 deletionsslurm/slurm.h.in
- slurm/slurmdb.h 1 addition, 1 deletionslurm/slurmdb.h
- src/api/partition_info.c 27 additions, 49 deletionssrc/api/partition_info.c
- src/common/assoc_mgr.c 22 additions, 22 deletionssrc/common/assoc_mgr.c
- src/common/assoc_mgr.h 1 addition, 1 deletionsrc/common/assoc_mgr.h
- src/common/forward.c 2 additions, 2 deletionssrc/common/forward.c
- src/common/forward.h 2 additions, 2 deletionssrc/common/forward.h
- src/common/list.c 721 additions, 663 deletionssrc/common/list.c
- src/common/list.h 1 addition, 1 deletionsrc/common/list.h
- src/common/print_fields.c 9 additions, 2 deletionssrc/common/print_fields.c
- src/common/read_config.c 18 additions, 7 deletionssrc/common/read_config.c
Loading
Please register or sign in to comment