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.

Sign up for GitHub

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

Jump to bottom

Stabilization/2310 Updates post branch creation #2480

Merged
merged 7 commits into from
Oct 9, 2023
Merged

Stabilization/2310 Updates post branch creation #2480

merged 7 commits into from
Oct 9, 2023

Conversation

RoddieKieley
Copy link
Contributor

Change summary

  • This will contain commits deemed necessary to be in the stabilization/2310 branch and may continue to be updated until the release is prepared starting on Thursday October 5th, proceeding until ready and released October 9th.

Submission Checklist:

  • Descriptive active voice - Do descriptive sentences have a clear subject and action verb?
  • Answer the question at hand - Does the documentation answer a what, why, how, or where type of question?
  • Consistency - Does the content consistently follow the Style Guide?
  • Help the user - Does the documentation show the user something meaningful?

spham-amzn and others added 3 commits September 22, 2023 14:09
@spham-amzn
Update to separate out libstdc++-9 (clang-12) and libstdc++12 (clang-…
15e0050 
…14) (o3de#2468)

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
@tkothadev
adding experimental project export instructions for iOS (o3de#2470)
4cb9410 
* adding experimental project export instructions for iOS

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* addressing feedback

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* addressing spham's feedback

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* addressing more spham feedback

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* adjusting export script code snippet

Signed-off-by: TJ Kotha <tankotha@amazon.com>

---------

Signed-off-by: TJ Kotha <tankotha@amazon.com>
Co-authored-by: TJ Kotha <tankotha@amazon.com>
@tkothadev
followup for ios export docs. including corrections from willihay (o3…
82324fc 
…de#2474)

Signed-off-by: TJ Kotha <tankotha@amazon.com>
Co-authored-by: TJ Kotha <tankotha@amazon.com>
@RoddieKieley RoddieKieley self-assigned this Oct 4, 2023
RoddieKieley and others added 2 commits October 4, 2023 18:53
@RoddieKieley
Merge branch 'development' into stabilization/2310
0fef75d 
- After review adding further commits from development that match
  changes in the stabilization/2310 branch of the software.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>
@Naomi-Wash @RoddieKieley
Update code-of-conduct.md (o3de#2469)
878af12 
* Update code-of-conduct.md

Removed mentions of CNCF

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>

* Update code-of-conduct.md

Removed now extraneous line regarding other languages.

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

---------

Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com>
Signed-off-by: Roddie Kieley <rkieley@redhat.com>
Co-authored-by: Roddie Kieley <rkieley@redhat.com>
(cherry picked from commit d9d3a03)
@RoddieKieley RoddieKieley marked this pull request as ready for review October 9, 2023 16:27
@RoddieKieley RoddieKieley requested a review from a team as a code owner October 9, 2023 16:27
@RoddieKieley RoddieKieley merged commit 4ec1fa4 into o3de:stabilization/2310 Oct 9, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amzn-changml amzn-changml amzn-changml approved these changes

@Ulrick28 Ulrick28 Ulrick28 approved these changes

Assignees

@RoddieKieley RoddieKieley

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@RoddieKieley @amzn-changml @Ulrick28 @spham-amzn @tkothadev @Naomi-Wash