Skip to content

TOOL-12604 linux-pkg's "push-merge.sh" script does not work for internal github repositories (#216)#233

Merged
prakashsurya merged 1 commit into6.0/stagefrom
dlpx/pr/prakashsurya/1e8f3db8-ade1-42c1-ba76-e4dc0133fa5c
May 6, 2022
Merged

TOOL-12604 linux-pkg's "push-merge.sh" script does not work for internal github repositories (#216)#233
prakashsurya merged 1 commit into6.0/stagefrom
dlpx/pr/prakashsurya/1e8f3db8-ade1-42c1-ba76-e4dc0133fa5c

Conversation

@prakashsurya
Copy link
Copy Markdown
Contributor

@prakashsurya prakashsurya commented May 5, 2022

This is a clean cherry-pick of #216; it's now required on 6.0/stage, since we're now merging upstream directly to the 6.0/stage branch of the delphix/zfs repository, when previously we were only merging to the master branch.

See also: http://reviews.delphix.com/r/80206/

@prakashsurya prakashsurya marked this pull request as ready for review May 5, 2022 18:15
@prakashsurya prakashsurya requested review from pcd1193182 and sebroy May 5, 2022 18:16
@prakashsurya prakashsurya merged commit 14dfeda into 6.0/stage May 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants