Code

bugfix/celery-chord-error#481

Code

Merged

bgunnar5 merged 23 commits intoLLNL:developLLNL/merlin:developfrom bgunnar5:bugfix/celery-chord-errorbgunnar5/merlin:bugfix/celery-chord-errorCopy head branch name to clipboardJun 5, 2024

+136-4

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 May 23, 2024

• Merge branch 'LLNL:develop' into develop

  bgunnar5

  authored
  358568e

  Copy full SHA for 358568e

Commits on May 24, 2024

• add celery results backend patch to stop ChordErrors

  bgunnar5

  committed
  adc4ebb

  Copy full SHA for adc4ebb

• add MERLIN_RAISE_ERROR return code

  bgunnar5

  committed
  3426db3

  Copy full SHA for 3426db3

• add tests to ensure chord error isn't raised

  bgunnar5

  committed
  07f558c

  Copy full SHA for 07f558c

• add RAISE_ERROR to docs

  bgunnar5

  committed
  fe1d4d9

  Copy full SHA for fe1d4d9

• update CHANGELOG

  bgunnar5

  committed
  33a1551

  Copy full SHA for 33a1551

• fix lint issues

  bgunnar5

  committed
  1b9d907

  Copy full SHA for 1b9d907

• up the sleep time on the chord error test

  bgunnar5

  committed
  db2924e

  Copy full SHA for db2924e

• add new steps to the chord err test spec

  bgunnar5

  committed
  547d6d3

  Copy full SHA for 547d6d3

Commits on May 28, 2024

• add tree statement to the new test for debugging

  bgunnar5

  committed
  4745ab7

  Copy full SHA for 4745ab7

• upping sleep time to see if that fixes github action for python 3.7

  bgunnar5

  committed
  9933f06

  Copy full SHA for 9933f06

• change sleep time for new test based on python version

  bgunnar5

  committed
  2e12d40

  Copy full SHA for 2e12d40

• run fix style

  bgunnar5

  committed
  e003d98

  Copy full SHA for e003d98

Commits on May 29, 2024

• remove specific sleep time for diff python versions

  bgunnar5

  committed
  c4043f0

  Copy full SHA for c4043f0