Merge CMSSW_10_6_X into CMSSW_10_6_DEVEL_X.

cms-sw · Apr 3, 2019 · de1d66c · de1d66c
2 parents 9ea3c5a + e10171a
commit de1d66c
Show file tree

Hide file tree

Showing 24 changed files with 3,009 additions and 2,709 deletions.
diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py
@@ -1,13 +1,13 @@
-# hltGetConfiguration --cff --data /dev/CMSSW_10_5_0/Fake1 --type Fake1
+# hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/Fake1 --type Fake1
 
-# /dev/CMSSW_10_5_0/Fake1/V2 (CMSSW_10_5_0_pre2)
+# /dev/CMSSW_10_6_0/Fake1/V2 (CMSSW_10_6_0_pre3_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_5_0/Fake1/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/Fake1/V2')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )

diff --git a/HLTrigger/Configuration/python/HLT_Fake2_cff.py b/HLTrigger/Configuration/python/HLT_Fake2_cff.py
@@ -1,13 +1,13 @@
-# hltGetConfiguration --cff --data /dev/CMSSW_10_5_0/Fake2 --type Fake2
+# hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/Fake2 --type Fake2
 
-# /dev/CMSSW_10_5_0/Fake2/V2 (CMSSW_10_5_0_pre2)
+# /dev/CMSSW_10_6_0/Fake2/V2 (CMSSW_10_6_0_pre3_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_5_0/Fake2/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/Fake2/V2')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )

diff --git a/HLTrigger/Configuration/python/HLT_Fake_cff.py b/HLTrigger/Configuration/python/HLT_Fake_cff.py
@@ -1,13 +1,13 @@
-# hltGetConfiguration --cff --data /dev/CMSSW_10_5_0/Fake --type Fake
+# hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/Fake --type Fake
 
-# /dev/CMSSW_10_5_0/Fake/V2 (CMSSW_10_5_0_pre2)
+# /dev/CMSSW_10_6_0/Fake/V2 (CMSSW_10_6_0_pre3_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_5_0/Fake/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/Fake/V2')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )