Skip to content

Commit

Permalink
Merge pull request #45882 from vlimant/bypass_inmerge_12.4
Browse files Browse the repository at this point in the history
[12_4_X_HLT] set bypassVersionCheck default to True again
  • Loading branch information
cmsbuild committed Sep 6, 2024
2 parents c9df55d + f5899a2 commit c8030c7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Configuration/DataProcessing/python/Merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def mergeProcess(*inputFiles, **options):
dropDQM = options.get("drop_dqm", False)
newDQMIO = options.get("newDQMIO", False)
mergeNANO = options.get("mergeNANO", False)
bypassVersionCheck = options.get("bypassVersionCheck", False)
bypassVersionCheck = options.get("bypassVersionCheck", True)
# //
# // build process
#//
Expand Down
2 changes: 1 addition & 1 deletion Configuration/DataProcessing/test/RunMerge.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def __init__(self):
self.inputFiles = []
self.newDQMIO = False
self.mergeNANO = False
self.bypassVersionCheck = False
self.bypassVersionCheck = True


def __call__(self):
Expand Down

0 comments on commit c8030c7

Please sign in to comment.