Code

feature/queue info#461

Code

Merged

bgunnar5 merged 17 commits intoLLNL:feature/revamped-statusLLNL/merlin:feature/revamped-statusfrom bgunnar5:feature/queue-infobgunnar5/merlin:feature/queue-infoCopy head branch name to clipboardFeb 1, 2024

+571-891

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 Dec 13, 2023

• Merge remote-tracking branch 'origin/develop' into develop

  bgunnar5

  committed
  0ef09bc

  Copy full SHA for 0ef09bc

Commits on Jan 24, 2024

• Merge remote-tracking branch 'upstream-main/develop' into develop

  bgunnar5

  committed
  fb6058c

  Copy full SHA for fb6058c

Commits on Jan 25, 2024

• Merge remote-tracking branch 'upstream-main/develop' into develop

  bgunnar5

  committed
  2a6ec3a

  Copy full SHA for 2a6ec3a

• pull status & detailed-status changes

  bgunnar5

  committed
  4399799

  Copy full SHA for 4399799

Commits on Jan 26, 2024

• add queue-info functionality

  bgunnar5

  committed
  0ec232c

  Copy full SHA for 0ec232c

• add tests for queue-info

  bgunnar5

  committed
  8d85b11

  Copy full SHA for 8d85b11

• update CHANGELOG

  bgunnar5

  committed
  ea11429

  Copy full SHA for ea11429

• merge in update from revamped-status

  bgunnar5

  committed
  5f7aa78

  Copy full SHA for 5f7aa78

Commits on Jan 29, 2024

• add try/except for forceful termination of test workers

  bgunnar5

  committed
  81f437a

  Copy full SHA for 81f437a

• change github workflow to use py38 with black instead of py36

  bgunnar5

  committed
  5c4db85

  Copy full SHA for 5c4db85

• run fix-style with py 3.12 and fix a typo in a test

  bgunnar5

  committed
  4771c8f

  Copy full SHA for 4771c8f

• add filetype check for dump option

  bgunnar5

  committed
  ccf5b4f

  Copy full SHA for ccf5b4f

Commits on Feb 1, 2024

• add banner print statement

  bgunnar5

  committed
  66f6c3a

  Copy full SHA for 66f6c3a