Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

Bump db to 9.6 #6949

Merged
merged 1 commit into from
Oct 18, 2019
Merged

Bump db to 9.6 #6949

merged 1 commit into from
Oct 18, 2019

Conversation

lgarciaaco
Copy link
Contributor

@syndesisio-bot
Copy link

@lgarciaaco The bot could not transition the ticket automatically, please update this Jira ticket manually: https://issues.jboss.org/browse/ENTESB-12039

@pure-bot
Copy link
Contributor

pure-bot bot commented Oct 18, 2019

Pull request approved by @zregvart - applying pr/approved label

@pure-bot pure-bot bot added the pr/approved Applied by pure-bot when a review is approved label Oct 18, 2019
@pure-bot pure-bot bot merged commit 3cfb780 into syndesisio:1.8.x Oct 18, 2019
@zregvart
Copy link
Member

Also of interest #6905

@backporting
Copy link

backporting bot commented Oct 18, 2019

The backport to master failed:

Commits ["62a176e94050db841ab3f0e1910d6db73da87486"] could not be cherry-picked on top of master

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport master
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 62a176e94050db841ab3f0e1910d6db73da87486
# Create a new branch with these backported commits.
git checkout -b backport-6949-to-master
# Push it to GitHub.
git push --set-upstream origin backport-6949-to-master
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is master and the compare/head branch is backport-6949-to-master.

@zregvart
Copy link
Member

Already included via #6919

@lgarciaaco lgarciaaco deleted the bump_db branch October 29, 2019 11:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
pr/approved Applied by pure-bot when a review is approved size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants