Merge branch 'slurm-15.08'
Conflicts: src/common/slurm_protocol_pack.c
Showing
- NEWS 13 additions, 0 deletionsNEWS
- auxdir/x_ac_json.m4 7 additions, 1 deletionauxdir/x_ac_json.m4
- config.h.in 6 additions, 0 deletionsconfig.h.in
- configure 11 additions, 1 deletionconfigure
- contribs/pmi2/README 2 additions, 2 deletionscontribs/pmi2/README
- contribs/pmi2/testpmi2.c 130 additions, 96 deletionscontribs/pmi2/testpmi2.c
- doc/html/Makefile.am 1 addition, 0 deletionsdoc/html/Makefile.am
- doc/html/Makefile.in 1 addition, 0 deletionsdoc/html/Makefile.in
- doc/html/documentation.shtml 1 addition, 0 deletionsdoc/html/documentation.shtml
- doc/html/news.shtml 1 addition, 1 deletiondoc/html/news.shtml
- doc/html/tres.shtml 113 additions, 0 deletionsdoc/html/tres.shtml
- doc/man/man5/slurm.conf.5 12 additions, 7 deletionsdoc/man/man5/slurm.conf.5
- slurm/slurm.h.in 1 addition, 0 deletionsslurm/slurm.h.in
- src/plugins/acct_gather_energy/ipmi/acct_gather_energy_ipmi.c 15 additions, 1 deletion...plugins/acct_gather_energy/ipmi/acct_gather_energy_ipmi.c
- src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c 2 additions, 1 deletion...plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c
- src/plugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c 3 additions, 2 deletions...ugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c
- src/plugins/burst_buffer/cray/burst_buffer_cray.c 22 additions, 15 deletionssrc/plugins/burst_buffer/cray/burst_buffer_cray.c
- src/plugins/jobacct_gather/common/common_jag.c 2 additions, 1 deletionsrc/plugins/jobacct_gather/common/common_jag.c
- src/plugins/mpi/pmi2/agent.c 23 additions, 4 deletionssrc/plugins/mpi/pmi2/agent.c
- src/plugins/mpi/pmi2/mpi_pmi2.c 11 additions, 0 deletionssrc/plugins/mpi/pmi2/mpi_pmi2.c
Loading
Please register or sign in to comment