Merge branch 'master' of https://github.com/chaos/slurm
Conflicts: NEWS
No related branches found
No related tags found
Showing
- META 2 additions, 1 deletionMETA
- Makefile.in 2 additions, 2 deletionsMakefile.in
- NEWS 6 additions, 1 deletionNEWS
- auxdir/ltmain.sh 0 additions, 0 deletionsauxdir/ltmain.sh
- auxdir/x_ac_cray.m4 2 additions, 0 deletionsauxdir/x_ac_cray.m4
- config.h.in 3 additions, 0 deletionsconfig.h.in
- configure 47 additions, 0 deletionsconfigure
- doc/html/cray.shtml 11 additions, 1 deletiondoc/html/cray.shtml
- doc/man/man1/scontrol.1 3 additions, 0 deletionsdoc/man/man1/scontrol.1
- slurm/slurm.h.in 1 addition, 0 deletionsslurm/slurm.h.in
- src/api/config_info.c 3 additions, 3 deletionssrc/api/config_info.c
- src/common/read_config.c 5 additions, 0 deletionssrc/common/read_config.c
- src/common/read_config.h 6 additions, 2 deletionssrc/common/read_config.h
- src/common/slurm_protocol_pack.c 0 additions, 1 deletionsrc/common/slurm_protocol_pack.c
- src/common/slurm_protocol_util.c 29 additions, 11 deletionssrc/common/slurm_protocol_util.c
- src/common/slurm_xlator.h 1 addition, 0 deletionssrc/common/slurm_xlator.h
- src/plugins/proctrack/cgroup/proctrack_cgroup.c 3 additions, 0 deletionssrc/plugins/proctrack/cgroup/proctrack_cgroup.c
- src/plugins/proctrack/linuxproc/kill_tree.c 8 additions, 1 deletionsrc/plugins/proctrack/linuxproc/kill_tree.c
- src/plugins/proctrack/pgid/proctrack_pgid.c 8 additions, 8 deletionssrc/plugins/proctrack/pgid/proctrack_pgid.c
- src/plugins/select/bluegene/ba/block_allocator.c 46 additions, 37 deletionssrc/plugins/select/bluegene/ba/block_allocator.c
Loading
Please register or sign in to comment