Applied the changes from #2469 to #2437. Otherwise auto-merging fails. #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…erging fails.
|
Sorry, I meant cms-sw#2468 not 2469. |
|
Never mind, Gaelle has included the changes in cms-sw#2489 |
franzoni
pushed a commit
that referenced
this pull request
Sep 23, 2014
franzoni
pushed a commit
that referenced
this pull request
Sep 23, 2014
franzoni
pushed a commit
that referenced
this pull request
Jan 23, 2015
…on_a4 Migration to the thread-safe DQM: #4
franzoni
pushed a commit
that referenced
this pull request
May 22, 2015
PRToFixMess_RPCDigitizerForUpgrade75XPR_v4
franzoni
pushed a commit
that referenced
this pull request
Jun 23, 2015
Update effAreaPhotons_cone03_pfChargedHadrons_V2.txt
franzoni
pushed a commit
that referenced
this pull request
Feb 17, 2016
fixed the monitor element issue causing seg faults
franzoni
pushed a commit
that referenced
this pull request
Apr 26, 2017
Refactor to have all cfg changes within customizeGSFixForPAT
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
Could you accept this so that pull request cms-sw#2437 gets updated please? There is a conflict in relval_steps.py with pull request cms-sw#2469 which has already been merged into CMSSW_6_2_X_SLHC. I don't have the permissions to merge directly, hence I cannot resolve it and merge the change myself. I can only merge entire pull requests.
Thanks.