search

opencomputeproject / onie

Open Network Install Environment
https://opencomputeproject.github.io/onie
Other
606 stars 377 forks source link

Accton x86_64 platforms: move to latest code base #1034

Closed david56 closed 1 year ago

david56 commented 1 year ago

I added 0602f323ef6c7d6fa1f0c2a92ec545eac9df1bfd to this PR for fixing conflict issue because both commits, 0602f323ef6c7d6fa1f0c2a92ec545eac9df1bfd and 3257e764935b034a9d6b40bc7348f28969f82692, change the same file (build-config/scripts/onie-build-targets.json).

mshych commented 1 year ago

Please check a conflict in the JSON file. "This branch has conflicts that must be resolved Conflicting files build-config/scripts/onie-build-targets.json"

Would you like also to align 3 remaining, not updated, Accton amd64 platforms?

david56 commented 1 year ago

I recreated the branch to fix conflict issue. And also changed the release branch of the 3 machines (AS7535-28XB, AS7946-30XB, and AS7946-74XKB) to 2023.05br. Thanks for your reminder.

mshych commented 1 year ago

Merged to master. Thank you.