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

doc: label v4.2.1 as LTS in changelog heading #3360

Closed
wants to merge 1 commit into from

Conversation

phillipj
Copy link
Member

Just as with #3343, v4.2.1 should probably also be marked as LTS rather than Stable.

Also what @jasnell decided when creating release blog post on new.nodejs.org/59411.

Needs to land on master and v4.x if it looks good

@cjihrig
Copy link
Contributor

cjihrig commented Oct 14, 2015

LGTM

@mscdex mscdex added the doc Issues and PRs related to the documentations. label Oct 14, 2015
@jasnell
Copy link
Member

jasnell commented Oct 14, 2015

Strange. I could have sworn I'd already done that. Ah well, thanks @phillipj ! LGTM

silverwind pushed a commit that referenced this pull request Oct 14, 2015
PR-URL: #3360
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
@silverwind
Copy link
Contributor

Thanks, landed in dae9fae.

@silverwind silverwind closed this Oct 14, 2015
@phillipj
Copy link
Member Author

Are you planning to land it in v4.x also, as done with v4.2.0 / 102cb72 @silverwind?

silverwind pushed a commit that referenced this pull request Oct 15, 2015
PR-URL: #3360
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
@silverwind
Copy link
Contributor

Done in b884899.

(Hope I did that right, had to modify the patch slightly so it applied)

@phillipj phillipj deleted the lts-in-changelog branch October 15, 2015 08:57
@silverwind
Copy link
Contributor

Found the cause: CHANGELOG.md on master has an empty line above the title, introduced in e4f2952.

cc: @Fishrock123

@MylesBorins
Copy link
Member

I think this should be backported

cc: @jasnell @Trott

@silverwind
Copy link
Contributor

In this case, I already did the v4.x backport on request: b884899.

Is it generally prefered that the commiter does the backporting him/herself or should we leave it to @nodejs/release handle it?

@rvagg
Copy link
Member

rvagg commented Oct 17, 2015

for now leave it to the @nodejs/release but that'll likely change over time as it becomes increasingly difficult, we'll have to come up with a better strategy when we end up doing lots of conflict resolution

@Fishrock123
Copy link
Member

@silverwind Oops. If it's causing issues let's remove that empty line.

@silverwind
Copy link
Contributor

@Fishrock123 can you put up a PR targeting master to sync the changelogs and remove that line?

@Fishrock123
Copy link
Member

@silverwind Sure, do you know off-hand what isn't in sync anymore?

@silverwind
Copy link
Contributor

v4.x is missing the 3.3.1 changelog (might be intended?) as well as 81503e5 and 3ef2e4a.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc Issues and PRs related to the documentations.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants