[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[HTCondor-users] condor_qsub broken in 8.0.1 due to lefover version control conflict tags

sorry for not submitting a formal bug, but I have troubles registering an account for the ticket system (without signing the CLA).

condor_qsub is currently broken by leftover diff marking (line 840):

mem=*) mem_value=${resource_type#*=}
<<<<<<< Updated upstream
mem_value="echo $mem_value | tr a-z A-Z"
>>>>>>> Stashed changes
printf "request_memory = $mem_value\n" >> $submit_file;;

I believe those need to be removed.