Code

bugfix/flux-nodes#484

Code

Merged

bgunnar5 merged 15 commits intoLLNL:developLLNL/merlin:developfrom bgunnar5:bugfix/flux-nodesbgunnar5/merlin:bugfix/flux-nodesCopy head branch name to clipboardJun 10, 2024

+25-2

Commits

Commits on Aug 4, 2023

• resolve CHANGELOG conflict

  bgunnar5

  committed
  7888493

  Copy full SHA for 7888493

• Merge branch 'develop' of https://github.com/LLNL/merlin into develop

  Show description for ec13acf
  bgunnar5

  committed
  ec13acf

  Copy full SHA for ec13acf

Commits on Nov 20, 2023

• merge latest changes from develop

  bgunnar5

  committed
  7c59fc2

  Copy full SHA for 7c59fc2

• remove a merge conflict statement that was missed

  bgunnar5

  committed
  29573d4

  Copy full SHA for 29573d4

Commits on Jan 25, 2024

• Merge branch 'develop' of https://github.com/LLNL/merlin into develop

  bgunnar5

  committed
  d4a33a6

  Copy full SHA for d4a33a6

• Merge branch 'develop' of https://github.com/LLNL/merlin into develop

  bgunnar5

  committed
  dc224b5

  Copy full SHA for dc224b5

Commits on Mar 11, 2024

• Merge branch 'develop' of https://github.com/LLNL/merlin into develop

  bgunnar5

  committed
  54af2b6

  Copy full SHA for 54af2b6

Commits on May 16, 2024

• Merge branch 'develop' of https://github.com/bgunnar5/merlin into develop

  bgunnar5

  committed
  0849acc

  Copy full SHA for 0849acc

• Merge branch 'develop' of https://github.com/bgunnar5/merlin into develop

  bgunnar5

  committed
  b44e285

  Copy full SHA for b44e285

Commits on Jun 5, 2024

• Merge branch 'develop' of https://github.com/LLNL/merlin into develop

  bgunnar5

  committed
  a98ce32

  Copy full SHA for a98ce32

• fix flux node allocation issue

  bgunnar5

  committed
  a8a4abe

  Copy full SHA for a8a4abe

• allow for vars to be used with nodes settings of workers/batch

  bgunnar5

  committed
  e1c5f96

  Copy full SHA for e1c5f96

• add tests for var usage with nodes

  bgunnar5

  committed
  b57078f

  Copy full SHA for b57078f

• update CHANGELOG

  bgunnar5

  committed
  420f954

  Copy full SHA for 420f954

• run fix-style

  bgunnar5

  committed
  056fe06

  Copy full SHA for 056fe06