Merge remote-tracking branch 'origin/slurm-14.03'
Conflicts: src/common/slurm_protocol_defs.c
No related branches found
No related tags found
Showing
- NEWS 2 additions, 0 deletionsNEWS
- src/common/slurm_protocol_defs.c 1 addition, 1 deletionsrc/common/slurm_protocol_defs.c
- src/sview/block_info.c 3 additions, 1 deletionsrc/sview/block_info.c
- src/sview/common.c 6 additions, 5 deletionssrc/sview/common.c
- src/sview/front_end_info.c 1 addition, 0 deletionssrc/sview/front_end_info.c
- src/sview/job_info.c 1 addition, 0 deletionssrc/sview/job_info.c
- src/sview/node_info.c 3 additions, 1 deletionsrc/sview/node_info.c
- src/sview/part_info.c 3 additions, 1 deletionsrc/sview/part_info.c
- src/sview/resv_info.c 3 additions, 1 deletionsrc/sview/resv_info.c
Loading
Please register or sign in to comment