Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into benc-remove-channels
Conflicts: docs/reference.rst parsl/channels/base.py parsl/channels/errors.py parsl/channels/local/local.py parsl/dataflow/dflow.py parsl/tests/test_channels/test_local_channel.py
- Loading branch information