Conflicts:
	src/plugins/switch/cray/switch_cray.c

Mostly cosmetic changes. The only real problem was adding un/pack
logic support for different versions of Slurm.

The alpscomm prologue and epilogue don't need to be called for batch
steps, so this patch skips it.

This was missed in the original Cray GA patch set. It is some html
documentation for the new switch plugin functions job_step_pre_resume,
job_step_post_resume, etc.

failures. This patch fixes the build.

but confusing users when it appeared in job output. This patch changes
it to a debug message.

down (like during a sync) new events wouldn't be added to the event list.
This patch fixes the bug.

which should just be set to the same value as the memory limit. This
patch sets that parameter.

* Don't propagate virtual memory by default since DMAPP and others require
  unlimited
* Use default performance governor to match current Cray systems
* Only allocate 2 craynetwork resources to KNC nodes since they have half
  the network resources of other nodes.

labeling the extern functions as such.

Previously network cookies were leased indefinitely. If a problem occurs
where cookies weren't released on job exit it could lead to all cookies
being reserved. This change results in cookies being leased for a set
period of time so they will automatically be released after the
time expires.

Conflicts:
	doc/html/team.shtml

renamed the patch for make 3.81 and added a patch for gnu make 4.0

Previous test could fail for node names numeric suffix with more
than one digit. This captures all digits plus checks for names
without a numeric suffix.

Conflicts:
	src/slurmctld/job_mgr.c

Introduced in commit dc7a1fca

Fix error handling for job array create failure due to inability to copy
job files (script and environment).
See bug 1077

are hard links to the first element specification files. If the
controller fails to make the links the files are copied instead.

ignore autogenerated cgroup.release_common.example

see bug 1035

Conflicts:
	testsuite/expect/test1.84
	testsuite/expect/test21.32