svn merge -r12863:12878 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

NEWS

@@ -113,6 +113,10 @@ documents those changes that are of interest to users and admins.
     Moved existing digital signature logic into new plugin: crypto/openssl.
     Added new support for crypto/munge (available with GPL license).
 
+* Changes in SLURM 1.2.22
+=========================
+
+
 * Changes in SLURM 1.2.21
 =========================
  -- Fixed torque wrappers to look in the correct spot for the perl api

src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c

@@ -312,8 +312,7 @@ extern int jobacct_storage_p_fini()
 extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 {
 #ifdef HAVE_MYSQL
-	int	i,
-		rc=SLURM_SUCCESS;
+	int	rc=SLURM_SUCCESS;
 	char	*jname, *account, *nodes;
 	long	priority;
 	int track_steps = 0;

src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c

@@ -371,8 +371,7 @@ extern int jobacct_storage_p_fini()
 extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 {
 #ifdef HAVE_PGSQL
-	int	i,
-		rc=SLURM_SUCCESS;
+	int	rc=SLURM_SUCCESS;
 	char	*jname, *account, *nodes;
 	long	priority;
 	int track_steps = 0;

src/slurmctld/node_scheduler.c

@@ -106,6 +106,8 @@ static int _pick_best_load(struct job_record *job_ptr, bitstr_t * bitmap,
 			   uint32_t min_nodes, uint32_t max_nodes, 
 			   uint32_t req_nodes, bool test_only);
 
+static int _job_count_bitmap(bitstr_t * bitmap, bitstr_t * jobmap,
+			     int job_cnt); 
 #endif
 static int _pick_best_nodes(struct node_set *node_set_ptr,
 			    int node_set_size, bitstr_t ** select_bitmap,
@@ -113,8 +115,6 @@ static int _pick_best_nodes(struct node_set *node_set_ptr,
 			    struct part_record *part_ptr,
 			    uint32_t min_nodes, uint32_t max_nodes,
 			    uint32_t req_nodes);
-static int _job_count_bitmap(bitstr_t * bitmap, bitstr_t * jobmap,
-			     int job_cnt); 
 static void _print_feature_list(uint32_t job_id, List feature_list);
 static bitstr_t *_valid_features(struct job_details *detail_ptr, 
 				 char *available);
@@ -329,7 +329,6 @@ _pick_best_load(struct job_record *job_ptr, bitstr_t * bitmap,
 	FREE_NULL_BITMAP(basemap);
 	return error_code;
 }
-#endif
 
 /*
  * Set the bits in 'jobmap' that correspond to bits in the 'bitmap'
@@ -352,6 +351,7 @@ _job_count_bitmap(bitstr_t * bitmap, bitstr_t * jobmap, int job_cnt)
 	}
 	return count;
 }
+#endif
 
 /*
  * Decide if a job can share nodes with other jobs based on the