Skip to content

Sync with upstream repo #7

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

Merged
merged 8 commits into from
Mar 25, 2025
Merged

Sync with upstream repo #7

merged 8 commits into from
Mar 25, 2025

Conversation

github-actions[bot]
Copy link

Merge latest changes from upstream repo

oke11o and others added 6 commits March 11, 2025 09:32
@sameersubudhi sameersubudhi requested review from Incede and removed request for matjazv March 25, 2025 07:53
Copy link
Member

@sameersubudhi sameersubudhi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as expected! 👍

Steps followed:

git checkout master
git pull
git checkout -b merge-upstream-changes
git fetch upstream
git merge -S upstream/master
git submodule update --recursive
make jib-docker
docker run --rm --name dshackle -p 4500-4599:4500-4599 -v $(pwd):/etc/dshackle:ro liskhq/dshackle

@sameersubudhi sameersubudhi enabled auto-merge March 25, 2025 08:01
@sameersubudhi sameersubudhi disabled auto-merge March 25, 2025 09:31
@sameersubudhi sameersubudhi merged commit eff016b into LiskHQ:master Mar 25, 2025
1 check passed
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.

6 participants