Conflicts:
	doc/html/gres.shtml
	doc/man/man5/gres.conf.5

The CPU specification enforcement is strict rather than advisory.

based upon unused variable reported by clang

Some new functions in config_info.c are only needed in that
module and not global.

I made some format changes for what I believe is better readability plus replacing spaces in some places with tabs.

The xfree() function does nothing if the input value is NULL, so there is no reason to check first for a non-zero value.

In slurm_write_ctl_conf(), the value tmp_str was xfreed, but not initialized. This was the only significant flaw that I saw in the code.

I also restructured the code in slurm_write_ctl_conf() a bit to eliminate a redundant memory allocation and copy of tmp_str.

Most of the Slurm fields are unsigned, so they should be printed using %u rather than %d.

Add mechanism for administrator to write current Slurm configuration
to a file containing a time stamp.

Mostly dead assignments

warning.

of cpus in the job_resources_t structure so as nodes finish the correct
cpu count is displayed in the user tools.

warning.

of cpus in the job_resources_t structure so as nodes finish the correct
cpu count is displayed in the user tools.

an allocation inside accounting

Conflicts:
	src/common/gres.c

Previous logic would only make available the CPUs associated with
the first N GRES, where N is the number of requested GRES. CPUs
which might be made available by using different GRES were not
considered available.
bug 1092

As I iterate through the hierarchy, they get changed to that of the
respective slurmd nodes.

I initially used slurm_get_slurmd_port() but it returns the value of
SlurmdPort from slurm.conf. This is the same value for all emulated
slurmd.

What I need is the port assigned to each the slurmd from the node
definition record. For example NodeName=trek[000-054] Port=[18000-18054],
I need 18000,... not 6818.

This is what this patch does, it gets the port from the config instead of
the default from the api.

Conflicts:
	src/salloc/opt.c

the craynetwork gres