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

Prevent concurrent db actions sapp 4587 #219

Closed

Conversation

audave
Copy link

@audave audave commented Feb 7, 2025

No description provided.

pingers and others added 30 commits October 19, 2018 14:26
Adds a site version report by querying OpenShift pod label.

See merge request web-team/ua-shepherd!6
* Remove the patch
* Copy things from the upstream profile into the UA Shepherd profile
* Remove the upstream profile
Export uni specific production config.

See merge request web-team/ua-shepherd!8
David Coote added 26 commits November 7, 2024 11:35
…openshift-4.x'

Introduce time delay between environment creation and other actions

See merge request web-team/ua-shepherd!20
…openshift-4.x'

Feature/prevent concurrent db actions sapp 4587

See merge request web-team/ua-shepherd!21
…' into 'openshift-4.x'"

This reverts commit 0e90435, reversing
changes made to b82271c.
…' into 'openshift-4.x'"

This reverts commit b82271c, reversing
changes made to a23f824.
[SAPP-4873] SHEPHERD | advanced environment list and filter

See merge request web-team/ua-shepherd!23
[SAPP-4761] SHEPHERD - Change new environment default fields

See merge request web-team/ua-shepherd!24
…into 'openshift-4.x'

Prevent Concurrent DB actions - refactor

See merge request web-team/ua-shepherd!22
@audave audave changed the base branch from develop to openshift-4.x February 7, 2025 00:32
@pingers
Copy link
Contributor

pingers commented Feb 10, 2025

Something is very wrong with this MR. There should be this many commits and changes.

EDIT: Okay, you've based your work off develop, then rebased or merged after the fact? Please start again and get rid of the extra merge commits. You could cherry pick your commits into a new feature branch based on openshift-4.x using a solution from https://stackoverflow.com/questions/1670970/how-to-cherry-pick-multiple-commits

@pingers
Copy link
Contributor

pingers commented Feb 10, 2025

Happy to review once I can read the diff - sorry!

@audave audave closed this Feb 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants