svn merge -r16140:16157 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
Showing
- NEWS 3 additions, 1 deletionNEWS
- auxdir/x_ac_bluegene.m4 5 additions, 5 deletionsauxdir/x_ac_bluegene.m4
- auxdir/x_ac_sun_const.m4 1 addition, 1 deletionauxdir/x_ac_sun_const.m4
- config.h.in 1 addition, 1 deletionconfig.h.in
- configure 4 additions, 4 deletionsconfigure
- doc/man/man1/sacctmgr.1 2 additions, 2 deletionsdoc/man/man1/sacctmgr.1
- doc/man/man1/scancel.1 3 additions, 3 deletionsdoc/man/man1/scancel.1
- src/plugins/select/bluegene/plugin/bg_job_run.c 13 additions, 5 deletionssrc/plugins/select/bluegene/plugin/bg_job_run.c
- src/plugins/select/bluegene/plugin/block_sys.c 254 additions, 1 deletionsrc/plugins/select/bluegene/plugin/block_sys.c
- src/plugins/select/bluegene/plugin/bluegene.c 34 additions, 20 deletionssrc/plugins/select/bluegene/plugin/bluegene.c
- src/plugins/select/bluegene/plugin/bluegene.h 5 additions, 0 deletionssrc/plugins/select/bluegene/plugin/bluegene.h
- src/plugins/select/bluegene/plugin/select_bluegene.c 3 additions, 291 deletionssrc/plugins/select/bluegene/plugin/select_bluegene.c
- src/scancel/opt.c 5 additions, 5 deletionssrc/scancel/opt.c
- src/slurmctld/controller.c 4 additions, 2 deletionssrc/slurmctld/controller.c
- testsuite/expect/Makefile.am 1 addition, 0 deletionstestsuite/expect/Makefile.am
- testsuite/expect/Makefile.in 1 addition, 0 deletionstestsuite/expect/Makefile.in
- testsuite/expect/README 5 additions, 0 deletionstestsuite/expect/README
- testsuite/expect/globals_accounting 1365 additions, 0 deletionstestsuite/expect/globals_accounting
- testsuite/expect/test21.13 21 additions, 424 deletionstestsuite/expect/test21.13
- testsuite/expect/test21.14 30 additions, 439 deletionstestsuite/expect/test21.14
Loading
Please register or sign in to comment