Skip to content

Nanostack release for mbedos 5 14 #11423

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
Merged
merged 2 commits into from
Sep 6, 2019
Merged

Nanostack release for mbedos 5 14 #11423

merged 2 commits into from
Sep 6, 2019

Conversation

JarkkoPaso
Copy link

Description

Nanostack release candidate for mbed OS 5.14.0

Following libraries updated using using git subtree:

  • features/nanostack/sal-stack-nanostack to v11.2.1

Removed Nanostack dependency to MbedTLS internal data structures.
Contains also minor fixes to Nanostack.

Pull request type

[x] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@artokin @mikter @mikaleppanen @juhhei01 @SeppoTakalo @kjbracey-arm

Jarkko Paso added 2 commits September 5, 2019 14:28
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 4a19dc4…
396dae5 
…..c473148

c473148 Merge branch 'release_internal' into release_external
d7ad405 Merge pull request ARMmbed#2179 from ARMmbed/release_internal_merge
668fc82 Merge branch 'master' into release_internal
9458a30 Added crypto library to unit test makefile
ff83e4b Added crypto library include path
4292326 Updated eapol TLS library to use extended version of export keys callback
f8f0762 Corrected authenticator EAP-TLS start retries
00fdf8d Added sending of initial EAPOL-key to original target during bootstrap
313794c Wi-sun neighbor temporary neigh update
05fa359 added support for EAPOL timing adjustment
cfc3223 RPL parent confirmation process update
c3a2c5c Added limit to BR supplicant entries
21de90d RPL dio handler update
425a04a Fix Slaac Handler for not native IPv6 stack.
5722a4a Wi-sun multicast neighbour and RPL update

git-subtree-dir: features/nanostack/sal-stack-nanostack
git-subtree-split: c473148
Merge commit '396dae52ab4eef15910011432f2c7a4261fc22b7'
4ebbbc5 
* commit '396dae52ab4eef15910011432f2c7a4261fc22b7':
  Squashed 'features/nanostack/sal-stack-nanostack/' changes from 4a19dc4..c473148
@ciarmcom
Copy link
Member

ciarmcom commented Sep 5, 2019

@JarkkoPaso, thank you for your changes.
@mikaleppanen @juhhei01 @kjbracey-arm @mikter @SeppoTakalo @artokin @ARMmbed/mbed-os-mesh @ARMmbed/mbed-os-maintainers please review.

@artokin
Copy link
Contributor

artokin commented Sep 6, 2019

CI started

@mbed-ci
Copy link

mbed-ci commented Sep 6, 2019

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 1
Build artifacts

@0xc0170
Copy link
Contributor

0xc0170 commented Sep 6, 2019

Shall be ready for integration today?!

@0xc0170 0xc0170 merged commit c2df001 into ARMmbed:master Sep 6, 2019
@adbridge
Copy link
Contributor

@JarkkoPaso please create a PR directly against the mbed-os-5.14 branch with these changes as they cannot be cherry picked across due to the strange merge commit.

@artokin
Copy link
Contributor

artokin commented Sep 13, 2019

@adbridge , would you please try with:
git cherry-pick 396dae52ab4eef15910011432f2c7a4261fc22b7 following
git cherry-pick -m 1 4ebbbc592d52d834b439c438d9c699a3c7e62cbd
and finally git commit --allow-empty. This seems to merge the commits to Mbed OS 5.14 branch.

cc: @kjbracey-arm , would you have any other trick to do this?

@SeppoTakalo SeppoTakalo mentioned this pull request Oct 8, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

@kjbracey kjbracey kjbracey approved these changes

@mikter mikter mikter approved these changes

@mikaleppanen mikaleppanen mikaleppanen approved these changes

@artokin artokin Awaiting requested review from artokin

@juhhei01 juhhei01 Awaiting requested review from juhhei01

@SeppoTakalo SeppoTakalo Awaiting requested review from SeppoTakalo

Assignees
No one assigned
Labels
release-version: 5.14.0-rc3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@JarkkoPaso @ciarmcom @artokin @mbed-ci @0xc0170 @adbridge @kjbracey @mikter @mikaleppanen