Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward port CMSSW_7_0_X into CMSSW_7_1_X (Fixed Conflicts) #4207

Merged
merged 17 commits into from Jun 15, 2014

Conversation

nclopezo
Copy link
Contributor

I continued with the forward port done here #4190

I fixed the conflicts that were in the file:
Configuration/PyReleaseValidation/python/relval_steps.py

I left what currently is in 7_1_X, I would like to know if this is correct.

Giovanni Franzoni and others added 17 commits May 23, 2014 17:14
…ng wherever needec by premix workflows; TEMPORARY
…sure RECO of prod premix workflows use consistent GT
…up_70x

hltGetConfiguration cleanup for 7.0.x
…-23-0200-premixPROD2

premix relvals: adapt to fixes of premixing
…ix_from-CMSSW_7_0_X_2014-05-23-1400

Fix for jet flavour clustering: Backport from 7_1_X to 7_0_X
Conflicts:
	Configuration/PyReleaseValidation/python/relval_steps.py
@nclopezo nclopezo changed the title Fix forward port Forward port CMSSW_7_0_X into CMSSW_7_1_X (Fixed Conflicts) Jun 11, 2014
@cmsbuild
Copy link
Contributor

A new Pull Request was created by @nclopezo (David Mendez) for CMSSW_7_1_X.

Forward port CMSSW_7_0_X into CMSSW_7_1_X (Fixed Conflicts)

It involves the following packages:

Configuration/PyReleaseValidation

@nclopezo, @vlimant, @cmsbuild, @franzoni, @Degano, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@nclopezo, @ktf you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@nclopezo nclopezo mentioned this pull request Jun 11, 2014
steps['DIGIPRMXUP15_PROD_PU25']=merge([premixProd,digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PROD_PU50']=merge([premixProd,digiPremixUp2015Defaults50ns])


dataReco={'--conditions':'auto:run1_data',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left this as it is in CMSSW_7_1_X

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

davidlange6 added a commit that referenced this pull request Jun 15, 2014
Forward port CMSSW_7_0_X into CMSSW_7_1_X (Fixed Conflicts)
@davidlange6 davidlange6 merged commit b790c53 into cms-sw:CMSSW_7_1_X Jun 15, 2014
@ktf ktf mentioned this pull request Jun 23, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants