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

Cherry pick to 2.4: [DBAL-717] Fix bug in MasterSlaveConnection with keepSlave option and switch back after transaction. #690

Merged
merged 1 commit into from
Oct 16, 2014

Conversation

adrienbrault
Copy link
Contributor

No description provided.

… switch back after transaction.

Conflicts:
	tests/Doctrine/Tests/DBAL/Functional/MasterSlaveConnectionTest.php
@doctrinebot
Copy link

Hello,

thank you for creating this pull request. However did not open it on the "master"
branch. Our Git workflow requires all pull requests to go through "master" branch
and the release masters then merge them back into stable branches, if they are
bug fixes.

Please open the pull request again for the "master" branch and close
this one.

Nevertheless I have opened a Jira ticket for this Pull Request to track this
issue:

http://www.doctrine-project.org/jira/browse/DBAL-1006

We use Jira to track the state of pull requests and the versions they got
included in.

@adrienbrault
Copy link
Contributor Author

Btw if this could get into 2.3 it'd be even more awesome!

@adrienbrault adrienbrault changed the title Backport [DBAL-717] Fix bug in MasterSlaveConnection with keepSlave option and switch back after transaction. Cherry pick to 2.4: [DBAL-717] Fix bug in MasterSlaveConnection with keepSlave option and switch back after transaction. Oct 16, 2014
@Ocramius
Copy link
Member

@adrienbrault not going to touch 2.3 unless it's a security issue.

@Ocramius Ocramius self-assigned this Oct 16, 2014
Ocramius added a commit that referenced this pull request Oct 16, 2014
Cherry pick to 2.4: [DBAL-717] Fix bug in MasterSlaveConnection with keepSlave option and switch back after transaction.
@Ocramius Ocramius merged commit 6a932e3 into doctrine:2.4 Oct 16, 2014
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 25, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants