Wrongly merged dev-controldir
!1145 (merged) Was by mistake merged into master on July 9. It looks like the actual branch that was merged was in fact not dev-controldir but dtr_test_fix branch.
What is very strange here, is that this merge commit has the same hash as !1448 (merged) - i.e. hash dee5650a
Doing git log --oneline --merges on the command line only shows the one merge commit of !1448 (merged) and not this one !1145 (merged)
Is the master now in the correct state?
maikenp:arc$ git diff master..next --name-only
src/libs/data-staging/test/ProcessorTest.cpp
src/services/a-rex/arc-arex-start.in
src/services/a-rex/get.cpp
src/services/a-rex/grid-manager/accounting/AAR.cpp
src/services/a-rex/grid-manager/files/ControlFileHandling.cpp
src/services/a-rex/grid-manager/files/ControlFileHandling.h
src/services/a-rex/grid-manager/gm_kick.cpp
src/services/a-rex/grid-manager/jobplugin/jobplugin.cpp
src/services/a-rex/grid-manager/jobs/DTRGenerator.cpp
src/services/a-rex/grid-manager/jobs/JobDescriptionHandler.cpp
src/services/a-rex/grid-manager/jobs/JobsList.cpp
src/services/a-rex/grid-manager/mail/smtp-send.sh
src/services/a-rex/grid-manager/run/RunParallel.cpp
src/services/a-rex/grid-manager/test_write_grami_file.cpp
src/services/a-rex/infoproviders/ARC1ClusterInfo.pm
src/services/a-rex/infoproviders/Condor.pm
src/services/a-rex/infoproviders/GMJobsInfo.pm
src/services/a-rex/job.cpp
src/services/a-rex/lrms/arc/lrms/common/scan.py
src/services/a-rex/lrms/arc/lrms/common/submit.py
src/services/a-rex/lrms/boinc/cancel-boinc-job.in
src/services/a-rex/lrms/boinc/scan-boinc-job.in
src/services/a-rex/lrms/condor/scan-condor-job.in
src/services/a-rex/lrms/fork/cancel-fork-job.in
src/services/a-rex/lrms/fork/scan-fork-job.in
src/services/a-rex/lrms/ll/scan-ll-job.in
src/services/a-rex/lrms/lrms_common.sh.in
src/services/a-rex/lrms/lsf/scan-lsf-job.in
src/services/a-rex/lrms/pbs/scan-pbs-job.in
src/services/a-rex/lrms/pbspro/scan-pbspro-job.in
src/services/a-rex/lrms/sge/scan-sge-job.in
src/services/a-rex/lrms/slurm/scan-SLURM-job.in
src/services/a-rex/lrms/slurmpy/test/scan/Makefile.am
src/services/a-rex/lrms/slurmpy/test/submit/Makefile.am
src/services/a-rex/lrms/submit_common.sh
src/services/a-rex/lrms/test/check_scan_script.sh
src/services/a-rex/lrms/test/check_submit_script.sh
The full diff is attached. diff_master_next.txt
I think the only change that needs to be reapplied is the actual dtr_test_fix change.
-
reapply the dtr_test_fix merge request to master !1460 (merged) -
check that master looks correct now - i.e. diff between master and next and check if only control-dir relevant iles are the diff
Edited by Maiken