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

77984 upgrade mrargs record4 #76

Closed
wants to merge 4 commits into from

Conversation

Projects
None yet
3 participants

iilyak added some commits Nov 14, 2016

Upgrade #mrargs{} record
Conflicts:
	src/fabric_util.erl
Revert "Revert "Merge remote-tracking branch 'banjiewen/stale-stable-…
…update'""

This reverts commit a8e0e95.

Note: Re-aplying previously reverted merge

@iilyak iilyak referenced this pull request Nov 14, 2016

Closed

converge #mrargs{} record #75

@rnewson

This comment has been minimized.

Copy link
Member

commented Nov 14, 2016

nicely done. +1

@davisp

This comment has been minimized.

Copy link
Member

commented Nov 14, 2016

Yes, but make this two PRs so that you can merge them intelligently. Took me a few minutes to realize that your PR description is saying this goes into two different releases. People are going to want to have two different commits on master to select between if they're doing similar rolling upgrades. Having those two commits on one side of a merge branch seems unwise.

@rnewson

This comment has been minimized.

Copy link
Member

commented Nov 14, 2016

fair point.

On 14 Nov 2016, at 23:47, Paul J. Davis notifications@github.com wrote:

Yes, but make this two PRs so that you can merge them intelligently. Took me a few minutes to realize that your PR description is saying this goes into two different releases. People are going to want to have two different commits on master to select between if they're doing similar rolling upgrades. Having those two commits on one side of a merge branch seems unwise.


You are receiving this because you commented.
Reply to this email directly, view it on GitHub, or mute the thread.

@iilyak

This comment has been minimized.

Copy link
Contributor Author

commented Nov 14, 2016

This is the first phase PR #77

@iilyak

This comment has been minimized.

Copy link
Contributor Author

commented Nov 15, 2016

Second phase PR #78

@iilyak

This comment has been minimized.

Copy link
Contributor Author

commented Nov 30, 2016

Closing it in favor of already merged:

@iilyak iilyak closed this Nov 30, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.