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

Jump to bottom

[Lock] Fix config merging in lock #39686

Merged
merged 1 commit into from Jan 3, 2021
Merged

[Lock] Fix config merging in lock #39686

merged 1 commit into from Jan 3, 2021

Conversation

jderusse
Copy link
Member

@jderusse jderusse commented Jan 2, 2021

Q A
Branch? 4.4
Bug fix? yes
New feature? no
Deprecations? no
Tickets Fix #35920
License MIT
Doc PR -

@jderusse jderusse mentioned this pull request Jan 2, 2021
Closed
@derrabus derrabus added this to the 4.4 milestone Jan 2, 2021
derrabus
derrabus approved these changes Jan 2, 2021
View changes
Copy link
Member

@derrabus derrabus left a comment

Your PR targets 5.x. Is that on purpose?

@derrabus
Copy link
Member

@derrabus derrabus commented Jan 2, 2021

Please make fabbot happy. 🙃

@jderusse jderusse changed the base branch from 5.x to 4.4 Jan 3, 2021
fabpot
fabpot approved these changes Jan 3, 2021
View changes
@fabpot
Copy link
Member

@fabpot fabpot commented Jan 3, 2021

Thank you @jderusse.

@fabpot fabpot merged commit a0d66d2 into symfony:4.4 Jan 3, 2021
3 of 5 checks passed
@jderusse jderusse deleted the fwb-lock-merge branch Jan 3, 2021
This was referenced Jan 27, 2021
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabpot fabpot

@derrabus derrabus

Assignees
No one assigned
Labels
Bug Lock Status: Reviewed
Projects
None yet
Milestone
4.4
Development

Successfully merging this pull request may close these issues.

[Framework-Bundle] Issue when redefining locks in different environments.
4 participants
@jderusse @derrabus @fabpot @carsonbot