Merge branch 'slurm-2.2'

NEWS

@@ -186,6 +186,8 @@ documents those changes that are of interest to users and admins.
  -- Get slurmd -f option working. Patch from Andriy Grytsenko.
  -- Fix for linking problem on OSX. Patches from Jon Bringhurst (LANL) and
     Tyler Strickland.
+ -- Reset a job's priority to zero (suspended) when Moab requeues the job.
+    Patch from Par Andersson, NSC.
 
 * Changes in SLURM 2.2.5
 ========================

src/plugins/sched/wiki2/job_requeue.c

@@ -85,6 +85,7 @@ extern int	job_requeue_wiki(char *cmd_ptr, int *err_code, char **err_msg)
 		xfree(job_ptr->details->req_nodes);
 		FREE_NULL_BITMAP(job_ptr->details->req_node_bitmap);
 	}
+	job_ptr->priority = 0;
 	info("wiki: requeued job %u", jobid);
 	unlock_slurmctld(job_write_lock);
 	snprintf(reply_msg, sizeof(reply_msg),