docs/server-cross-node (#470)

* remove a merge conflict statement that was missed * add a 'pip freeze' call in github workflow to view reqs versions * rename the merlin server config page * add instructions for running a cross-node workflow w/ containerized server * update CHANGELOG
LLNL · Apr 10, 2024 · de5367a · de5367a
1 parent 9390448
commit de5367a
Show file tree

Hide file tree

Showing 5 changed files with 626 additions and 181 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - New Priority.RETRY value for the Celery task priorities. This will be the new highest priority.
+- Documentation on how to run cross-node workflows with a containerized server (`merlin server`)
 
 ## [1.12.0]
 ### Added