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(xo-server/pool.mergeInto): fail when product brands are different #3118

Merged
merged 2 commits into from Jun 28, 2018
Merged

fix(xo-server/pool.mergeInto): fail when product brands are different #3118

merged 2 commits into from Jun 28, 2018

Conversation

pdonias
Copy link
Member

@pdonias pdonias commented Jun 28, 2018

Fixes #3061

Check list

Check items when done or if not relevant

  • PR reference the relevant issue (e.g. Fixes #007)
  • if UI changes, a screenshot has been added to the PR
  • CHANGELOG updated
  • documentation updated

Process

  1. create a PR as soon as possible
  2. mark it as WiP: (Work in Progress) if not ready to be merged
  3. when you want a review, add a reviewer
  4. if necessary, update your PR, and readd a reviewer

List of packages to release

No need to mention xo-server and xo-web.

@pdonias pdonias requested a review from julien-f June 28, 2018 07:49
@julien-f julien-f merged commit 358e144 into master Jun 28, 2018
@julien-f julien-f deleted the pierre-pool-merge-error branch June 28, 2018 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julien-f julien-f julien-f approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@pdonias @julien-f