Merge remote-tracking branch 'origin/slurm-14.03' (ca01515c) · Commits · tud-zih-energy / Slurm · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Slurm
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ca01515c

Commit ca01515c authored 10 years ago by Danny Auble

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/slurm-14.03'

Conflicts:
	configure

parents 93d9f256 82f0ec7e

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 1 addition, 0 deletions

NEWS
auxdir/slurm.m4 1 addition, 0 deletions

auxdir/slurm.m4
configure 11 additions, 10 deletions

configure
configure.ac 4 additions, 1 deletion

configure.ac
doc/html/Makefile.am 1 addition, 1 deletion

doc/html/Makefile.am
doc/html/Makefile.in 1 addition, 1 deletion

doc/html/Makefile.in
doc/html/cons_res.shtml 14 additions, 13 deletions

doc/html/cons_res.shtml
doc/html/mc_support.shtml 34 additions, 62 deletions

doc/html/mc_support.shtml
doc/man/man1/Makefile.am 1 addition, 1 deletion

doc/man/man1/Makefile.am
doc/man/man1/Makefile.in 1 addition, 1 deletion

doc/man/man1/Makefile.in
doc/man/man5/Makefile.am 1 addition, 1 deletion

doc/man/man5/Makefile.am
doc/man/man5/Makefile.in 1 addition, 1 deletion

doc/man/man5/Makefile.in
doc/man/man8/Makefile.am 1 addition, 1 deletion

doc/man/man8/Makefile.am
doc/man/man8/Makefile.in 1 addition, 1 deletion

doc/man/man8/Makefile.in
src/common/proc_args.c 1 addition, 1 deletion

src/common/proc_args.c

with 74 additions and 95 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung