Fixes for Issue 17 (miscompiled core) and possibly 21 (crash on loadi…

POETSII / Orchestrator

The Orchestrator is the configuration and run-time management system for POETS platforms.

1 stars 1 forks source link

Fixes for Issue 17 (miscompiled core) and possibly 21 (crash on loadi… #35

Closed AlexRast closed 5 years ago

AlexRast commented 5 years ago

…ng XML)

Some bug fixes. Issue 17 is now apparently solved (David's test XML passes) Issue 21 MAY be solved but needs further testing. This branch should be merged as at this point the supervisor fixes have been incorporated; further bugfixes will go in another branch TBC.

heliosfa commented 5 years ago

It looks like this branch was pulled off development quite some time ago. Is it worth re-basing your changes off of the current development head and checking that it all still works as expected?

mvousden commented 5 years ago

To be explicit, assuming your clone has both origin/supervisor_fixes and origin/development:

git fetch  # Updates origin/* definitions
git checkout supervisor_fixes  # Ensures you are on the correct branch locally.
git merge origin/supervisor_fixes  # Updates your local branch with changes from the remote, if any.
git merge origin/development  # Updates supervisor_fixes with the latest changes from development
# If it works, then git push

Come have a chat if you need help with this.

AlexRast commented 5 years ago

Currently this shows as having no conflicts. I'd like to close Issue 17. Can this be approved and pulled into development?