Skip to content
Snippets Groups Projects
Commit 5cc8a4d0 authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge branch 'master' into mpi_and_ht_affinity

Conflicts:
        src/engine.c
parents c34f643c e5a9a253
No related branches found
No related tags found
1 merge request!120Simplify, permit user control over affinity
Showing
with 456 additions and 132 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment