Conflicts:
	META
	NEWS
	src/common/parse_time.c
	src/plugins/gres/mic/gres_mic.c
	src/slurmd/slurmd/slurmd.c
	testsuite/expect/test1.84

This reverts commit 18b59d5d
to avoid breaking anything that parses sbatch/salloc/srun output
bug 438

Error message changed from
Missing time limit
to Job submission rejected due to missing time limit
bug 438

Make man page match the code (SLURM_STEP_ID is meant to replace
SLURM_STEPID).

is not parsed correctly.

gres/gpu and gres/mic - Do not treat the existence of an empty gres.conf
file as a fatal error. There may be no gres devices on that node so we
do not require the file. Assume gres counts of zero if no file.

bug 436

This has been seen only in slurmstepd with --enable-memory-leak-debug
enabled at slurmstepd shutdown time on the smd cluster with
Linux 3.8.0-23-generic #34-Ubuntu SMP Wed May 29 20:22:58 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux

bug 436

just print the job ID rather than "Submitted batch job #"

Conflicts:
	src/common/env.c

job CPU count not loaded correctly
Partition time limit format wrong (minutes rather than hhmmss format).

Convert bitmap functions to use int32_t instead of int in data structures
and function arguments. This is to reliably enable use of bitmaps containing
up to 4 billion elements. Several data structures containing index values
were also changed from data type int to int32_t:
- Struct job_info / slurm_job_info_t: Changed exc_node_inx, node_inx, and
  req_node_inx from type int to type int32_t
- job_step_info_t: Changed node_inx from type int to type int32_t
- Struct partition_info / partition_info_t: Changed node_inx from type int
  to type int32_t
- block_job_info_t: Changed cnode_inx from type int to type int32_t
- block_info_t: Changed ionode_inx and mp_inx from type int to type int32_t
- Struct reserve_info / reserve_info_t: Changed node_inx from type int to
  type int32_t

isn't doing the launching.

isn't doing the launching.

updated the srun man page.

Bug#435

sched/backfill - Prevent possible memory corruption due to use of
bf_continue option and long running scheduling cycle (pending jobs could
have been cancelled and purged).