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

adding patch for average X in Z decays - patch to replace pull #1410 #1481

Merged
merged 2 commits into from Nov 18, 2013
Merged

adding patch for average X in Z decays - patch to replace pull #1410 #1481

merged 2 commits into from Nov 18, 2013

Conversation

inugent
Copy link
Contributor

@inugent inugent commented Nov 16, 2013

adding patch for average X in Z decays

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @inugent for CMSSW_6_2_X.

patch to resolve conflict

It involves the following packages:

Validation/EventGenerator

@vciulli, @cmsbuild, @nclopezo can you please review it and eventually sign? Thanks.
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.
@davidlt you are the release manager for this.

@inugent
Copy link
Contributor Author

inugent commented Nov 16, 2013

Hi Dave,
I think it is fixed now, but when I try git merge I get:
git merge 2b9beb4
fatal: 2b9beb4 - not something we can merge
the same for ba563b6
Am I missing something? Thank you,
Ian

@cmsbuild
Copy link
Contributor

Pull request #1481 was updated. @vciulli, @cmsbuild, @nclopezo can you please check and sign again.

@davidlt
Copy link
Contributor

davidlt commented Nov 16, 2013

@inugent depending on what and how you do things. It does merge now cleanly on the last IB. Is it a full replacement for #1410 ? Please, edit the PR to add more meaningful subject. The merge message is what people will see in changelog.

@inugent
Copy link
Contributor Author

inugent commented Nov 16, 2013

This patch is a replacement for #1410. The issue was related to using an older CMSSW release for producing the tag. In this version the most recent nightly was used with the same changes (ie copied files from the 5_3_x pull request - note 5_3_x, 6_2_x and 7_0_X are kept consistent).

@vciulli
Copy link
Contributor

vciulli commented Nov 17, 2013

+1
tested on CMSSW_6_2_X_2013-11-17-1400

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next IBs unless changes or unless it breaks tests. @davidlt can you please take care of it?

@ghost ghost assigned davidlt Nov 17, 2013
davidlt added a commit that referenced this pull request Nov 18, 2013
adding patch for average X in Z decays - patch to replace pull #1410
@davidlt davidlt merged commit 0d9881b into cms-sw:CMSSW_6_2_X Nov 18, 2013
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

4 participants