Skip to content

Development -> Stabilization cherries: part 2 - #1103

Merged
jhanca-robotecai merged 5 commits into
o3de:stabilization/26100from
RobotecAI:jh/cherry-stabilization_v2
Oct 12, 2026
Merged

jhanca-robotecai merged 5 commits into
o3de:stabilization/26100from
RobotecAI:jh/cherry-stabilization_v2

Conversation

@jhanca-robotecai

Copy link
Copy Markdown
Collaborator

What does this PR do?

This is the remaining set of changes that were added to the development branch after the stabilization period started. All changes got approval for such merge earlier. After this PR, stabilization/26100 matches development:

How was this PR tested?

The code builds against stabilization/26100 (o3de b706d4f5b3) in a non-unity profile build with ROS 2 Lyrical. All o3de-extras unit tests pass (10 test modules, 122 passed, 1 skipped by design). The code was reviewed in the respective PRs.

welber-zhang and others added 5 commits October 12, 2026 13:38
)

Signed-off-by: welber-zhang <welber.zhang@huawei.com>
(cherry picked from commit bc9eb68)
Signed-off-by: Norbert Prokopiuk <norbert.prokopiuk@robotec.ai>
(cherry picked from commit d7b3858)
* [MachineLearning] Update ScriptCanvas after engine changes

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* [MachineLearning] Fix build

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

---------

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
(cherry picked from commit ee2ff33)
Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
(cherry picked from commit f23e7ae)
…ns (o3de#1099)

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>
(cherry picked from commit 2518837)
@jhanca-robotecai
jhanca-robotecai requested review from a team as code owners October 12, 2026 11:56
@jhanca-robotecai jhanca-robotecai changed the title Jh/cherry stabilization v2 Development -> Stabilization cherries: part 2 Oct 12, 2026
@jhanca-robotecai
jhanca-robotecai merged commit 66880e5 into o3de:stabilization/26100 Oct 12, 2026
3 checks passed
@jhanca-robotecai
jhanca-robotecai deleted the jh/cherry-stabilization_v2 branch October 12, 2026 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants