This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko.git
The following commit(s) were added to refs/heads/main by this push:
new 8ec6529672 Correct the flatMapMerge label in the substream diagram
(#3661)
8ec6529672 is described below
commit 8ec6529672f82911d1bd00e9e00556ad41a083e2
Author: He-Pin(kerr) <[email protected]>
AuthorDate: Fri Oct 23 17:39:09 2026 +0800
Correct the flatMapMerge label in the substream diagram (#3661)
* Correct the flatMapMerge label in the substream diagram
Motivation:
The substream diagram labels flatMapMerge as flatFlattenMerge.
Modification:
Use the upstream corrected diagram, preserving its merge semantics and
layout.
Result:
The diagram uses the same operator name as the API and surrounding
documentation.
Tests:
- Tests: Not run - docs only.
- Passed: `docs/paradox`.
- Passed: `+headerCheckAll`.
- Full `validatePullRequest` is left to remote CI.
References:
- Refs [akka/akka-core#32084](https://github.com/akka/akka-core/pull/32084).
- Upstream commit:
[ac53509f3eddc1e55c97b050b2e3dbdea6cea1cb](https://github.com/akka/akka-core/commit/ac53509f3eddc1e55c97b050b2e3dbdea6cea1cb).
- Source snapshot: Akka `v2.9.0`
(`bf20e967571574994ccb3cae411401f5a9021ab9`). Its
[license](https://github.com/akka/akka-core/blob/v2.9.0/LICENSE) names
2026-10-23 as the Change Date and Apache License 2.0 as the Change License.
`LICENSE` and `NOTICE` record the source, and original copyright notices are
retained. Headers were generated/checked with the project sbt tasks.
* Keep licensing metadata outside the migration change
Motivation:
Keep PR #3661 scoped to its code or documentation change.
Modification:
Restore the root LICENSE and NOTICE files to main.
Result:
The migration diff retains its source headers without repository-level
licensing edits.
Tests:
- git diff --check passed.
- Verified every other file is unchanged; prior focused validation still
applies.
References:
Refs #3661.
---
.../paradox/images/stream-substream-flatMapMerge.png | Bin 6813 -> 11714 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/docs/src/main/paradox/images/stream-substream-flatMapMerge.png
b/docs/src/main/paradox/images/stream-substream-flatMapMerge.png
index 3909dbddd2..77795fc088 100644
Binary files a/docs/src/main/paradox/images/stream-substream-flatMapMerge.png
and b/docs/src/main/paradox/images/stream-substream-flatMapMerge.png differ
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
