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.

Sign up for GitHub

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

Jump to bottom

Fix pulse transforms recursion bug fix that was lost in merge conflict #4974

Merged
merged 3 commits into from
Aug 25, 2020
Merged

Fix pulse transforms recursion bug fix that was lost in merge conflict #4974

merged 3 commits into from
Aug 25, 2020

Conversation

taalexander
Copy link
Contributor

Summary

This fix, readds the bugfix #4789, that was lost due to a bad conflict resolution in #4755.

Details and comments

@taalexander taalexander added the Changelog: Bugfix Include in the "Fixed" section of the changelog label Aug 25, 2020
@taalexander taalexander requested review from DanPuzzuoli, eggerdj and a team as code owners August 25, 2020 02:14
@taalexander taalexander added the stable backport potential The bug might be minimal and/or import enough to be port to stable label Aug 25, 2020
@1ucian0 1ucian0 removed the automerge label Aug 25, 2020
@mergify mergify bot merged commit 04f2079 into Qiskit:master Aug 25, 2020
mergify bot pushed a commit that referenced this pull request Aug 25, 2020
@taalexander
Fix pulse transforms recursion bug fix that was lost in merge conflict (
5279da7 
#4974)

* Fix bug fix that was lost in merge conflict.

* Added bug fix reno.

* Revert style.

(cherry picked from commit 04f2079)
@mergify mergify bot mentioned this pull request Aug 25, 2020
Merged
mergify bot added a commit that referenced this pull request Aug 25, 2020
@mergify @taalexander
Fix pulse transforms recursion bug fix that was lost in merge conflict (
15ca9d3 
#4974) (#4977)

* Fix bug fix that was lost in merge conflict.

* Added bug fix reno.

* Revert style.

(cherry picked from commit 04f2079)

Co-authored-by: Thomas Alexander <thomas.a.alexander@ibm.com>
@1ucian0 1ucian0 added the mod: pulse Related to the Pulse module label Jan 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nkanazawa1989 nkanazawa1989 nkanazawa1989 approved these changes

@lcapelluto lcapelluto lcapelluto approved these changes

@DanPuzzuoli DanPuzzuoli Awaiting requested review from DanPuzzuoli

@eggerdj eggerdj Awaiting requested review from eggerdj

Assignees

@lcapelluto lcapelluto

Labels
Changelog: Bugfix Include in the "Fixed" section of the changelog mod: pulse Related to the Pulse module stable backport potential The bug might be minimal and/or import enough to be port to stable
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@taalexander @lcapelluto @nkanazawa1989 @1ucian0 @mtreinish