svn merge -r16065:16069 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3

src/sacctmgr/qos_functions.c

@@ -94,6 +94,10 @@ static int _set_cond(int *start, int argc, char *argv[],
 			if(slurm_addto_char_list(qos_cond->description_list,
 						 argv[i]+end))
 				set = 1;
+		} else if (!strncasecmp (argv[i], "Format", 
+					 MAX(command_len, 1))) {
+			if(format_list)
+				slurm_addto_char_list(format_list, argv[i]+end);
 		} else if(!strncasecmp (argv[i], "Ids", MAX(command_len, 1))) {
 			ListIterator itr = NULL;
 			char *temp = NULL;