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

Gen 2/3 merge #1700

Merged
merged 1,438 commits into from Mar 5, 2019

Conversation

@avtolstoy
Copy link
Member

commented Feb 27, 2019

Problem

Gen 3 DeviceOS is currently a fork of Gen 2 DeviceOS.

Solution

This PR merges Gen 2 and Gen 3 DeviceOS.

Note: This PR does not make sure that all on-devices test are buildable for all the platforms and/or pass them. The tests are to be handled in a separate PR.

Steps to Test

N/A

Example App

N/A

References

  • [CH28694]
  • [CH29000]
  • [CH28689]
  • [CH28686]
  • [CH28683]

Completeness

  • User is totes amazing for contributing!
  • Contributor has signed CLA (Info here)
  • Problem and Solution clearly stated
  • Run unit/integration/application tests on device
  • Added documentation
  • Added to CHANGELOG.md after merging (add links to docs and issues)

  • [Feature] Gen 3 device firmware mesh_develop merged into develop #1700
  • [Photon/P1/Electron] mbedTLS updated from v2.4.2 to v2.9.0 #1700
  • [Electron/LTE] FreeRTOS updated from v8.2.2 to v10.0.1 #1700
YutingYou and others added 30 commits Nov 6, 2018
Eugene
Eugene
Eugene
Eugene
Eugene
Merge pull request #1596 from particle-iot/fix/nd6-dhcpv4-dns-conflict
[Mesh] Fixes a conflict between DHCPv4 and ND6 DNS server list
[services] Make escape() terminate the output with a '\0' and return …
…the number of characters in the escaped string
Merge pull request #1585 from particle-iot/feature/get-network-system…
…-events-in-order

[Mesh] Network system events

@avtolstoy avtolstoy requested review from sergeuz and m-mcgowan Feb 27, 2019

@avtolstoy

This comment has been minimized.

Copy link
Member Author

commented Feb 28, 2019

Closes #1699

@avtolstoy

This comment has been minimized.

Copy link
Member Author

commented Feb 28, 2019

Closes #1673

@technobly technobly self-requested a review Mar 5, 2019

@avtolstoy avtolstoy merged commit 89a5650 into develop Mar 5, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@avtolstoy avtolstoy deleted the feature/merge branch Mar 5, 2019

@technobly technobly added the mesh label Mar 5, 2019

@technobly technobly added this to the 1.0.2-rc.1 milestone Mar 5, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.