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

Reinitializing deleted pointers to nullptr #14067

Merged
merged 1 commit into from Apr 14, 2016

Conversation

avetisya
Copy link
Contributor

This is a small fix that sets deleted pointers to nullptr as requested in #14031 .

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @avetisya (Aram Avetisyan) for CMSSW_8_1_X.

It involves the following packages:

HLTrigger/JSONMonitoring

@Martin-Grunewald, @perrotta, @cmsbuild, @fwyzard, @davidlange6 can you please review it and eventually sign? Thanks.
@Martin-Grunewald this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@Martin-Grunewald
Copy link
Contributor

please test
PR for 80X?

@cmsbuild
Copy link
Contributor

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/12368/console

@cmsbuild
Copy link
Contributor

@avetisya
Copy link
Contributor Author

PR for 80X?
I am trying, but I can't seem to make a pull request which has only this fix. What is the correct way to deal with a change that goes on top of something which has already been merged, but is not in an IB yet?

@Martin-Grunewald
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_1_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @Degano, @smuzaffar

@Martin-Grunewald
Copy link
Contributor

Simply update the 80X PR you have already by pushing the additional fix to the same branch
you used to make the non-merged PR.

@fwyzard
Copy link
Contributor

fwyzard commented Apr 14, 2016

PR for 80X?

I am trying, but I can't seem to make a pull request which has only this fix. What is the correct way to deal with a change that goes on top of something which has already been merged, but is not in an IB yet?

Without trying myself, I think you could

  • create an area for the latest IB
  • git checkout CMSSW_8_0_X
  • git pull
  • git cherry-pick 96f6006 # this is the 8.1.x commit
  • git push my-cmssw HEAD:nullptr-reinitialization-fix-80x

.A

@avetisya
Copy link
Contributor Author

Thanks. I reused the old branch and it seems to work. I was worried that pushing to this branch would modify the existing pull requests which use it, but it looks like once they're merged, they can no longer be modified.

@cmsbuild
Copy link
Contributor

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 7bc1699 into cms-sw:CMSSW_8_1_X Apr 14, 2016
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