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

[5.0] Revert "batch: Use easy_merge for merging (SOC-10505)" #1934

Merged
merged 1 commit into from Sep 23, 2019
Merged

[5.0] Revert "batch: Use easy_merge for merging (SOC-10505)" #1934

merged 1 commit into from Sep 23, 2019

Conversation

rsalevsky
Copy link
Member

This reverts commit ce564c3.

@rsalevsky rsalevsky changed the title Revert "batch: Use easy_merge for merging (SOC-10505)" [5.0] Revert "batch: Use easy_merge for merging (SOC-10505)" Sep 23, 2019
@rsalevsky rsalevsky merged commit ac645b7 into crowbar:stable/5.0-pike Sep 23, 2019
@rsalevsky rsalevsky deleted the 5.0_revert_batch_deep_merge branch September 23, 2019 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefannica stefannica stefannica approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
2 participants
@rsalevsky @stefannica