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

v4.8.1 proposal #11760

Merged
merged 148 commits into from
Mar 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
3516f35
deps: backport 7c3748a from upstream V8
cristiancavalli Jan 18, 2017
e0dc0ce
build: don't squash signal handlers with --shared
Dec 30, 2016
35a660e
crypto: fix handling of root_cert_store.
agl Oct 30, 2016
a9eb093
src: fix memory leak introduced in 34febfbf4
bnoordhuis Nov 14, 2016
2f48001
src: use ABORT() macro instead of abort()
evanlucas Nov 15, 2016
b48f6ff
crypto: use CHECK_NE instead of ABORT or abort
sam-github Dec 22, 2016
4ce9bfb
test: exclude pseudo-tty test pertinent to #11541
gireeshpunathil Feb 28, 2017
15231aa
http: reject control characters in http.request()
bnoordhuis Oct 4, 2016
5367336
test: simplify test-http-client-unescaped-path
rvagg Nov 17, 2016
87db4f7
build: Don't regenerate node symlink
Nov 28, 2016
094bfe6
build: fix node_g target
danbev Dec 6, 2016
530adfd
doc: improve rinfo object documentation
Dec 1, 2016
3be7a7a
doc: update LTS info for current releases
evanlucas Jan 10, 2017
56b779d
doc: "s/git apply/git am -3" in V8 guide
MylesBorins Jan 6, 2017
8f0e31b
doc: add test naming information to guide
Trott Jan 3, 2017
b10842a
doc: sort require statements in tests
sam-github Jan 4, 2017
7287ddd
doc: add links for zlib convenience methods
addaleax Jan 16, 2017
6d0e162
doc: clarifying variables in fs.write()
jalafel Nov 24, 2016
e656a42
doc: add edsadr to collaborators
edsadr Jan 18, 2017
79f700c
doc: add TimothyGu to collaborators
TimothyGu Jan 22, 2017
05273c5
doc: update AUTHORS list to fix name
Jan 22, 2017
0109321
test: refactor test-https-truncate
Trott Dec 11, 2016
fc2cd63
lib,src: support values > 4GB in heap statistics
bnoordhuis Dec 8, 2016
d0dbf12
doc: update TheAlphaNerd to MylesBorins
MylesBorins Jan 3, 2017
994f562
assert: update comments
kaicataldo Jan 2, 2017
a597c11
benchmark: improve readability of net benchmarks
mscdex Dec 25, 2016
434b00b
meta: decharter the http working group
jasnell Jan 4, 2017
a7df345
net: prefer === to ==
notarseniy Feb 22, 2017
d622b67
doc: document clientRequest.aborted
zbjornson Feb 24, 2017
53f2848
test: favor assertions over console logging
Trott Feb 25, 2017
09c9105
doc: argument types for assert methods
ameliavoncat Feb 25, 2017
75af859
assert: apply minor refactoring
Trott Feb 22, 2017
f0c7c7f
test: fix flaky test-vm-timeout-rethrow
kunalspathak Feb 24, 2017
f4bc12d
doc: note message event listeners ref IPC channels
DiegoRBaquero Feb 22, 2017
f0eee61
test: throw check in test-zlib-write-after-close
Feb 21, 2017
bfc553d
build: fail on CI if leftover processes
Trott Feb 9, 2017
da2adb7
src: update http-parser link
danbev Feb 21, 2017
6a45ac0
build: fix newlines in addon build output
mscdex Feb 20, 2017
ef63af6
tty: avoid oob warning in TTYWrap::GetWindowSize()
reklatsmasters Feb 18, 2017
53dd1a8
tls: do not crash on STARTTLS when OCSP requested
indutny Jan 9, 2017
9da6ebd
benchmark: add dgram bind(+/- params) benchmark
vsemozhetbyt Feb 11, 2017
fa681ea
test: add regex check to test-module-loading
tarang9211 Feb 16, 2017
6abfcd5
doc: add comment for net.Server's error event
jjqq2013 Feb 12, 2017
cd3e17e
test: improve coverage in test-crypto.dh
ejc-main Feb 9, 2017
28471c2
test: refactor test-http-response-splitting
notarseniy Feb 16, 2017
2b867d2
child_process: refactor internal/child_process.js
notarseniy Feb 14, 2017
4676eec
child_process: remove empty if condition
cjihrig Feb 16, 2017
bf4703d
test: remove unused args and comparison fix
sashashakun Feb 14, 2017
41bf266
doc: add STYLE_GUIDE (moved from nodejs/docs)
gibfahn Feb 12, 2017
485ec6c
doc: change STYLE-GUIDE to STYLE_GUIDE
Dean-Coakley Feb 20, 2017
8f49962
tools: suggest python2 command in configure
silverwind Feb 15, 2017
f2fb414
test: refactor test-dgram-membership
Trott Feb 14, 2017
d1a8588
test: improve message in net-connect-local-error
Trott Feb 15, 2017
0c9ea4f
doc: dns examples implied string args were arrays
sam-github Feb 13, 2017
090037a
assert: remove unneeded condition
Trott Feb 11, 2017
77f23ec
assert: unlock the assert API
Trott Feb 10, 2017
d729e52
test: improve crypto coverage
akito0107 Feb 10, 2017
61ac334
doc: update code examples in domain.md
vsemozhetbyt Feb 1, 2017
c4e1af7
src: remove unused typedef
bnoordhuis Feb 12, 2017
caf1ba1
test: add coverage for dgram _createSocketHandle()
cjihrig Feb 10, 2017
8629c95
test: improve punycode test coverage
seppevs Feb 3, 2017
6f1db35
doc: update email and add personal pronoun
JungMinu Feb 12, 2017
342c3e2
meta: adding Italo A. Casas PGP Fingerprint
italoacasas Feb 6, 2017
cb81ae8
test: add vm module edge cases
fhinkel Feb 9, 2017
923309a
meta: remove Chris Dickinson from CTC
chrisdickinson Feb 9, 2017
10afa8b
doc: drop "and io.js" from release section
bnoordhuis Jan 28, 2017
30d9202
doc: improve consistency in documentation titles
vsemozhetbyt Feb 7, 2017
e1e02ef
doc: clarify the behavior of Buffer.byteLength
seishun Feb 9, 2017
6648b72
tools: add compile_commands.json gyp generator
bnoordhuis Aug 5, 2016
bb1e97c
doc: add and fix System Error properties
darai0512 Jan 24, 2017
ca4b2f6
doc: fix typo in dgram doc
Trott Feb 5, 2017
4bb6155
build: disable C4267 conversion compiler warning
bnoordhuis Feb 6, 2017
c532c16
test: increase specificity in dgram test
Trott Feb 5, 2017
aae768c
doc: remove extraneous paragraph from assert doc
Trott Feb 5, 2017
2b6ee39
doc: improve testing guide
joyeecheung Feb 3, 2017
2016aa4
doc: add not-an-aardvark as ESLint contact
Trott Feb 4, 2017
533d2bf
meta: add explicit deprecation and semver-major policy
jasnell Aug 3, 2016
788d736
doc: typographical fixes in COLLABORATOR_GUIDE.md
addaleax Feb 4, 2017
e90317d
doc: fix "initial delay" link in http.md
Krinkle Feb 1, 2017
115448e
doc: remove assertions about assert
Trott Feb 2, 2017
c2d7090
doc: edit stability text for clarity and style
Trott Feb 2, 2017
b86843a
doc: clarify msg when doc/api/cli.md not updated
Jan 18, 2017
d55d760
doc: add personal pronouns option
Trott Jan 31, 2017
a557d6c
src: unconsume stream fix in internal http impl
Kasher Jan 26, 2017
a40f842
readline: update 6 comparions to strict
umairishaq Jan 31, 2017
c56719f
crypto: Remove expired certs from CNNIC whitelist
shigeki Nov 4, 2016
c6f6b02
crypto: add cert check issued by StartCom/WoSign
shigeki Nov 4, 2016
1db89d4
test: improve coverage on removeListeners functions
Feb 3, 2017
f24aa7e
test: improve error messages in test-npm-install
gonenduk Jan 26, 2017
07dfed8
doc: fix confusing example in dns.md
vsemozhetbyt Jan 26, 2017
f464dd8
doc: edit CONTRIBUTING.md for clarity
Trott Jan 27, 2017
a074290
doc: correct and complete dgram's Socket.bind docs
strugee Jan 26, 2017
1518890
doc: add who to CC list for dgram
cjihrig Jan 27, 2017
db03294
doc: fix typo in http.md
magnetikonline Jan 24, 2017
c1f45ec
test: add 2nd argument to throws in test-assert
Marlena Jan 29, 2017
50a868b
test: require handler to be run in sigwinch test
Trott Jan 30, 2017
3f3c78d
test: refactor test-fs-utimes
jun-oka Oct 26, 2016
1ae95e6
test: improve test-fs-readfile-zero-byte-liar
edsadr Jan 2, 2017
42b86ea
test: improve test-http-chunked-304
edsadr Jan 7, 2017
4453c0c
test: refactor the code in test-child-process-spawn-loop.js
sivaprs Jan 4, 2017
ab65429
test: refactor test-watch-file.js
sivaprs Jan 7, 2017
4d51db8
test: refactor test-doctool-html.js
hiroppy Jan 8, 2017
f86c64a
test: refactor the code of test-keep-alive.js
sivaprs Jan 8, 2017
279cb09
src: enable writev for pipe handles on Unix
aqrln Jan 7, 2017
626875f
benchmark: don't lint autogenerated modules
mscdex Jan 12, 2017
9abde3a
test: use realpath for NODE_TEST_DIR in common.js
gibfahn Jan 10, 2017
6e7dfb1
test: fix temp-dir option in tools/test.py
gibfahn Jan 10, 2017
396688f
readline: refactor construct Interface
JacksonTian Jan 18, 2016
b3d1700
test: improve tests in pummel/test-exec
chasestarr Jan 12, 2017
725a896
doc: remove duplicate properties bullet in readme
trendsetter37 Jan 11, 2017
53b0f41
test: improve the code in test-process-cpuUsage
edsadr Jan 12, 2017
af3c211
build: move source files from headers section
danbev Jan 17, 2017
89e9da6
test: tests for _readableStream.awaitDrain
shmuga Jan 17, 2017
1c223ec
test: add http-common's test
hiroppy Jan 16, 2017
7bceb4f
test: add message verification on assert.throws
tmeisenh Jan 19, 2017
9c53e40
crypto: freelist_max_len is gone in OpenSSL 1.1.0
agl Jan 17, 2017
90d8e11
src: add a missing space in node_os.cc
aqrln Jan 21, 2017
df69c21
test: check fd 0,1,2 are used, not access mode
jBarz Dec 16, 2016
56970ef
test: increase coverage for punycode's decode
hiroppy Jan 21, 2017
b3a8e95
test: improve test-assert
richnologies Jan 20, 2017
22c25de
buffer: improve toJSON() performance
mscdex Jan 19, 2017
a1a850f
test: don't connect to :: (use localhost instead)
gibfahn Jan 17, 2017
db60d92
test: test hmac binding robustness
sam-github Jan 20, 2017
e607ff5
tools: rename eslintrc to an undeprecated format
thefourtheye Jul 13, 2016
a9278a0
test: refactor cluster-preload.js
hiroppy Jan 9, 2017
9ac2316
test: improve code in test-http-host-headers
edsadr Jan 16, 2017
ee27917
test: improve test-stream2-large-read-stall
stefanjudis Jan 10, 2017
1b1ba74
test: improve code in test-domain-multi
edsadr Jan 15, 2017
017afd4
test: improve code in test-console-instance
edsadr Jan 17, 2017
6c1d82c
test: improving coverage for dgram
hiroppy Jan 13, 2017
4d1f7b1
test: add dgram.Socket.prototype.bind's test
hiroppy Jan 19, 2017
d8af5a7
test: improve code in test-crypto-verify
edsadr Jan 20, 2017
c9a92ff
crypto: return the retval of HMAC_Update
tmeisenh Jan 19, 2017
6ca9901
test: add process.assert's test
hiroppy Jan 20, 2017
4b83a83
tools,doc: add Google Analytics tracking.
phillipj Jan 25, 2017
3f6a2db
test: enhance test-timers
Trott Jan 23, 2017
850f85d
benchmark: add benchmark for object properties
targos Jan 21, 2017
2f4b6bd
test: expand test coverage of fs.js
vinimdocarmo Jan 23, 2017
14e57c1
benchmark: add more thorough timers benchmarks
Fishrock123 Jan 20, 2017
dc24127
test: allow for slow hosts in spawnSync() test
Trott Jan 25, 2017
be34b62
test: increase coverage for stream's duplex
hiroppy Jan 23, 2017
fc2bb2c
doc: remove Chris Dickinson from active releasers
bnoordhuis Jan 26, 2017
1df09f9
test: add known_issues test for #10223
AnnaMag Jan 26, 2017
f854d8c
test: increase setMulticastLoopback() coverage
cjihrig Feb 10, 2017
2c84601
util: don't init Debug if it's not needed yet
bengl Sep 8, 2016
f9e121e
dgram: fix possibly deoptimizing use of arguments
vsemozhetbyt Feb 8, 2017
48b5097
http: make request.abort() destroy the socket
lpinca Jan 15, 2017
9551665
2017-03-21, Version 4.8.1 'Argon' (LTS)
MylesBorins Mar 9, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ test/disabled
test/tmp*/
tools/eslint
node_modules
benchmark/tmp/
File renamed without changes.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ Felix Becker <felix.b@outlook.com>
Igor Klopov <igor@klopov.com>
Tsarevich Dmitry <dimhotepus@users.noreply.github.com>
Ojas Shirekar <ojas.shirekar@gmail.com>
Noah Rose <noahroseledesma@seattleacademy.org>
Noah Rose Ledesma <noahroseledesma@seattleacademy.org>
Rafael Cepeda <rcepeda1993@gmail.com>
Chinedu Francis Nwafili <frankie.nwafili@gmail.com>
Braydon Fuller <braydon@bitpay.com>
Expand Down
165 changes: 165 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

224 changes: 211 additions & 13 deletions COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

* [Issues and Pull Requests](#issues-and-pull-requests)
* [Accepting Modifications](#accepting-modifications)
- [Internal vs. Public API](#internal-vs-public-api)
- [Breaking Changes](#breaking-changes)
- [Deprecations](#deprecations)
- [Involving the CTC](#involving-the-ctc)
* [Landing Pull Requests](#landing-pull-requests)
- [Technical HOWTO](#technical-howto)
Expand Down Expand Up @@ -81,6 +84,206 @@ All pull requests that modify executable code should be subjected to
continuous integration tests on the
[project CI server](https://ci.nodejs.org/).

### Internal vs. Public API

Due to the nature of the JavaScript language, it can often be difficult to
establish a clear distinction between which parts of the Node.js implementation
represent the "public" API Node.js users should assume to be stable and which
are considered part of the "internal" implementation detail of Node.js itself.
A general rule of thumb has been to base the determination off what
functionality is actually *documented* in the official Node.js API
documentation. However, it has been repeatedly demonstrated that either the
documentation does not completely cover implemented behavior or that Node.js
users have come to rely heavily on undocumented aspects of the Node.js
implementation.

While there are numerous exceptions, the following general rules should be
followed to determine which aspects of the Node.js API are considered
"internal":

- Any and all functionality exposed via `process.binding(...)` is considered to
be internal and *not* part of the Node.js Public API.
- Any and all functionality implemented in `lib/internal/**/*.js` that is not
re-exported by code in `lib/*.js`, or is not documented as part of the
Node.js Public API, is considered to be internal.
- Any object property or method whose key is a non-exported `Symbol` is
considered to be an internal property.
- Any object property or method whose key begins with the underscore `_` prefix,
and is not documented as part of the Node.js Public API, is considered to be
an internal property.
- Any object, property, method, argument, behavior, or event not documented in
the Node.js documentation is considered to be internal.
- Any native C/C++ APIs/ABIs exported by the Node.js `*.h` header files that
are hidden behind the `NODE_WANT_INTERNALS` flag are considered to be
internal.

Exception to each of these points can be made if use or behavior of a given
internal API can be demonstrated to be sufficiently relied upon by the Node.js
ecosystem such that any changes would cause too much breakage. The threshold
for what qualifies as "too much breakage" is to be decided on a case-by-case
basis by the CTC.

If it is determined that a currently undocumented object, property, method,
argument, or event *should* be documented, then a pull request adding the
documentation is required in order for it to be considered part of the "public"
API.

Making a determination about whether something *should* be documented can be
difficult and will need to be handled on a case-by-case basis. For instance, if
one documented API cannot be used successfully without the use of a second
*currently undocumented* API, then the second API *should* be documented. If
using an API in a manner currently undocumented achieves a particular useful
result, a decision will need to be made whether or not that falls within the
supported scope of that API; and if it does, it should be documented.

Breaking changes to internal elements are permitted in semver-patch or
semver-minor commits but Collaborators should take significant care when
making and reviewing such changes. Before landing such commits, an effort
must be made to determine the potential impact of the change in the ecosystem
by analyzing current use and by validating such changes through ecosystem
testing using the [Canary in the Goldmine](https://github.com/nodejs/citgm)
tool. If a change cannot be made without ecosystem breakage, then CTC review is
required before landing the change as anything less than semver-major.

If a determination is made that a particular internal API (for instance, an
underscore `_` prefixed property) is sufficiently relied upon by the ecosystem
such that any changes may break user code, then serious consideration should be
given to providing an alternative Public API for that functionality before any
breaking changes are made.

### Breaking Changes

Backwards-incompatible changes may land on the master branch at any time after
sufficient review by collaborators and approval of at least two CTC members.

Examples of breaking changes include, but are not necessarily limited to,
removal or redefinition of existing API arguments, changing return values
(except when return values do not currently exist), removing or modifying
existing properties on an options argument, adding or removing errors,
changing error messages in any way, altering expected timing of an event (e.g.
moving from sync to async responses or vice versa), and changing the
non-internal side effects of using a particular API.

With a few notable exceptions outlined below, when backwards incompatible
changes to a *Public* API are necessary, the existing API *must* be deprecated
*first* and the new API either introduced in parallel or added after the next
major Node.js version following the deprecation as a replacement for the
deprecated API. In other words, as a general rule, existing *Public* APIs
*must not* change (in a backwards incompatible way) without a deprecation.

Exception to this rule is given in the following cases:

* Adding or removing errors thrown or reported by a Public API;
* Changing error messages;
* Altering the timing and non-internal side effects of the Public API.

Such changes *must* be handled as semver-major changes but MAY be landed
without a [Deprecation cycle](#deprecation-cycle).

From time-to-time, in particularly exceptional cases, the CTC may be asked to
consider and approve additional exceptions to this rule.

Purely additive changes (e.g. adding new events to EventEmitter
implementations, adding new arguments to a method in a way that allows
existing code to continue working without modification, or adding new
properties to an options argument) are handled as semver-minor changes.

Note that errors thrown, along with behaviors and APIs implemented by
dependencies of Node.js (e.g. those originating from V8) are generally not
under the control of Node.js and therefore *are not directly subject to this
policy*. However, care should still be taken when landing updates to
dependencies when it is known or expected that breaking changes to error
handling may have been made. Additional CI testing may be required.

#### When breaking changes actually break things

Breaking changes are difficult primarily because they change the fundamental
assumptions a user of Node.js has when writing their code and can cause
existing code to stop functioning as expected -- costing developers and users
time and energy to fix.

Because breaking (semver-major) changes are permitted to land in master at any
time, it should be *understood and expected* that at least some subset of the
user ecosystem *may* be adversely affected *in the short term* when attempting
to build and use Node.js directly from master. This potential instability is
precisely why Node.js offers distinct Current and LTS release streams that
offer explicit stability guarantees.

Specifically:

* Breaking changes should *never* land in Current or LTS except when:
* Resolving critical security issues.
* Fixing a critical bug (e.g. fixing a memory leak) requires a breaking
change.
* There is CTC consensus that the change is required.
* If a breaking commit does accidentally land in a Current or LTS branch, an
attempt to fix the issue will be made before the next release; If no fix is
provided then the commit will be reverted.

When any change is landed in master, and it is determined that the such
changes *do* break existing code, a decision may be made to revert those
changes either temporarily or permanently. However, the decision to revert or
not can often be based on many complex factors that are not easily codified. It
is also possible that the breaking commit can be labeled retroactively as a
semver-major change that will not be backported to Current or LTS branches.

### Deprecations

Deprecation refers to the identification of Public APIs that should no longer
be used and that may be removed or modified in non-backwards compatible ways in
a future major release of Node.js. Deprecation *may* be used with internal APIs
if there is expected impact on the user community.

Node.js uses three fundamental Deprecation levels:

* *Documentation-Only Deprecation* refers to elements of the Public API that are
being staged for deprecation in a future Node.js major release. An explicit
notice indicating the deprecated status is added to the API documentation
*but no functional changes are implemented in the code*. There will be no
runtime deprecation warning emitted for such deprecations.

* *Runtime Deprecation* refers to the use of process warnings emitted at
runtime the first time that a deprecated API is used. A command-line
switch can be used to escalate such warnings into runtime errors that will
cause the Node.js process to exit. As with Documentation-Only Deprecation,
the documentation for the API must be updated to clearly indicate the
deprecated status.

* *End-of-life* refers to APIs that have gone through Runtime Deprecation and
are ready to be removed from Node.js entirely.

Documentation-Only Deprecations *may* be handled as semver-minor or
semver-major changes. Such deprecations have no impact on the successful
operation of running code and therefore should not be viewed as breaking
changes.

Runtime Deprecations and End-of-life APIs (internal or public) *must* be
handled as semver-major changes unless there is CTC consensus to land the
deprecation as a semver-minor.

All Documentation-Only and Runtime deprecations will be assigned a unique
identifier that can be used to persistently refer to the deprecation in
documentation, emitted process warnings, or errors thrown. Documentation for
these identifiers will be included in the Node.js API documentation and will
be immutable once assigned. Even if End-of-Life code is removed from Node.js,
the documentation for the assigned deprecation identifier must remain in the
Node.js API documentation.

<a id="deprecation-cycle"></a>
A "Deprecation cycle" is one full Node.js major release during which an API
has been in one of the three Deprecation levels. (Note that Documentation-Only
Deprecations may land in a Node.js minor release but must not be upgraded to
a Runtime Deprecation until the next major release.)

No API can be moved to End-of-life without first having gone through a
Runtime Deprecation cycle.

A best effort will be made to communicate pending deprecations and associated
mitigations with the ecosystem as soon as possible (preferably *before* the pull
request adding the deprecation lands in master). All deprecations included in
a Node.js release should be listed prominently in the "Notable Changes" section
of the release notes.

### Involving the CTC

Collaborators may opt to elevate pull requests or issues to the CTC for
Expand Down Expand Up @@ -253,15 +456,15 @@ You can find more information [in the full LTS plan](https://github.com/nodejs/l

#### How does LTS work?

Once a stable branch enters LTS, changes in that branch are limited to bug
Once a Current branch enters LTS, changes in that branch are limited to bug
fixes, security updates, possible npm updates, documentation updates, and
certain performance improvements that can be demonstrated to not break existing
applications. Semver-minor changes are only permitted if required for bug fixes
and then only on a case-by-case basis with LTS WG and possibly Core Technical
Committee (CTC) review. Semver-major changes are permitted only if required for
security related fixes.

Once a stable branch moves into Maintenance mode, only **critical** bugs,
Once a Current branch moves into Maintenance mode, only **critical** bugs,
**critical** security fixes, and documentation updates will be permitted.

#### Landing semver-minor commits in LTS
Expand All @@ -281,9 +484,8 @@ CTC for further discussion.

#### How are LTS Branches Managed?

There are currently three LTS branches: `v4.x`, `v0.10`, and `v0.12`. Each
of these is paired with a "staging" branch: `v4.x-staging`, `v0.10-staging`,
and `v0.12-staging`.
There are currently two LTS branches: `v6.x` and `v4.x`. Each of these is paired
with a "staging" branch: `v6.x-staging` and `v4.x-staging`.

As commits land in `master`, they are cherry-picked back to each staging
branch as appropriate. If the commit applies only to the LTS branch, the
Expand All @@ -304,18 +506,14 @@ please feel free to include that information in the PR thread.

Several LTS related issue and PR labels have been provided:

* `lts-watch-v6.x` - tells the LTS WG that the issue/PR needs to be considered
for landing in the `v6.x-staging` branch.
* `lts-watch-v4.x` - tells the LTS WG that the issue/PR needs to be considered
for landing in the `v4.x-staging` branch.
* `lts-watch-v0.10` - tells the LTS WG that the issue/PR needs to be considered
for landing in the `v0.10-staging` branch.
* `lts-watch-v0.12` - tells the LTS WG that the issue/PR needs to be considered
for landing in the `v0.12-staging` branch.
* `land-on-v6.x` - tells the release team that the commit should be landed
in a future v6.x release
* `land-on-v4.x` - tells the release team that the commit should be landed
in a future v4.x release
* `land-on-v0.10` - tells the release team that the commit should be landed
in a future v0.10 release
* `land-on-v0.12` - tells the release team that the commit should be landed
in a future v0.12 release

Any collaborator can attach these labels to any PR/issue. As commits are
landed into the staging branches, the `lts-watch-` label will be removed.
Expand Down
Loading