Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version/1.12.2 #492

Merged
merged 68 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
aeaef79
fix default worker bug with all steps
bgunnar5 May 4, 2023
ad75ed6
bugfix/worker-all-steps (#419)
bgunnar5 May 4, 2023
f7508dd
version bump and requirements fix
bgunnar5 May 4, 2023
c8c6a44
release/1.10.1 (#420)
bgunnar5 May 4, 2023
98e06f6
Bugfix/filename-special-vars (#425)
bgunnar5 May 25, 2023
b8dd2b2
Create dependabot-changelog-updater.yml
bgunnar5 May 26, 2023
4c40423
testing outputs of modifying changelog
bgunnar5 May 26, 2023
2d231fb
delete dependabot-changelog-updater
bgunnar5 May 26, 2023
6b142d9
feature/pdf-docs (#427)
bgunnar5 Jun 28, 2023
e3e1a30
bugfix/openfoam_singularity_issues (#426)
bgunnar5 Jun 28, 2023
12ff3d7
bugfix/output-path-substitution (#430)
bgunnar5 Jul 11, 2023
5c69c0b
bugfix/scheduler-permission-error (#436)
bgunnar5 Aug 4, 2023
c01f635
Release/1.10.2 (#437)
bgunnar5 Aug 4, 2023
7888493
resolve CHANGELOG conflict
bgunnar5 Aug 4, 2023
9c52ba2
resolve develop to main merge issues (#439)
bgunnar5 Aug 5, 2023
d63661c
resolve merge conflicts
bgunnar5 Aug 5, 2023
77d09c3
merge v1.10.2 into this branch
bgunnar5 Aug 14, 2023
b0f4d86
dependabot/certifi-requests-pygments (#441)
bgunnar5 Aug 17, 2023
c641c5c
bugfix/server-pip-redis-conf (#443)
bgunnar5 Aug 18, 2023
970a06f
bump to version 1.10.3 (#444)
bgunnar5 Aug 18, 2023
0384463
Merge branch 'main' into develop
bgunnar5 Aug 18, 2023
1977f1b
Merge remote-tracking branch 'origin/develop' into develop
bgunnar5 Aug 18, 2023
7155c6d
merge v1.10.3 to local main branch
bgunnar5 Aug 22, 2023
1b0fa95
trying to merge origin main
bgunnar5 Aug 22, 2023
d8bfbdb
bugfix/sphinx-5.3.0-requirement (#446)
bgunnar5 Aug 22, 2023
dabbd3f
Merge remote-tracking branch 'upstream-main/main'
bgunnar5 Aug 25, 2023
015e88b
Merge remote-tracking branch 'origin'
bgunnar5 Aug 25, 2023
ea715db
remove github text that was causing errors
bgunnar5 Aug 25, 2023
8241bfe
feature/vlauncher (#447)
bgunnar5 Sep 28, 2023
50d0fb6
release/1.11.0 (#448)
bgunnar5 Sep 28, 2023
066bea1
resolve merge conflicts
bgunnar5 Oct 5, 2023
99d5659
bugfix/skewed-sample-hierarchy (#450)
bgunnar5 Oct 9, 2023
593dbcd
bugfix/lsf-gpu-typo (#453)
bgunnar5 Oct 23, 2023
f994f96
release/1.11.1 (#454)
bgunnar5 Oct 23, 2023
89093dd
resolve merge conflict
bgunnar5 Oct 23, 2023
8d75482
pull changes from upstream main
bgunnar5 Oct 23, 2023
5dc8206
Add Pytest Fixtures to Test Suite (#456)
bgunnar5 Nov 2, 2023
38651f2
Bugfix for WEAVE CI (#457)
bgunnar5 Nov 15, 2023
b9afbdb
bugfix/monitor-shutdown (#452)
bgunnar5 Dec 12, 2023
642f925
Add the missing restart keyword to the specification docs. (#459)
koning Jan 19, 2024
40930c2
docs/conversion-to-mkdocs (#460)
bgunnar5 Jan 25, 2024
f36c58d
openfoam tutorial modifications (#463)
xorJane Feb 14, 2024
320d12f
feature/revamped status (#464)
bgunnar5 Feb 14, 2024
d111565
release/1.12.0 (#465)
bgunnar5 Feb 14, 2024
801d0bf
resolve merge conflicts with version bump
bgunnar5 Feb 14, 2024
acb1820
Merge remote-tracking branch 'upstream-main/main' into main
bgunnar5 Feb 15, 2024
9390448
feature/retry_priority (#468)
bgunnar5 Feb 22, 2024
de5367a
docs/server-cross-node (#470)
bgunnar5 Apr 10, 2024
cdad6e5
bugfix/initial-status-issues (#471)
bgunnar5 Apr 15, 2024
51d6787
release/1.12.1 (#472)
bgunnar5 Apr 15, 2024
4a07800
resolve merge conflicts with main
bgunnar5 Apr 16, 2024
bba68ab
fix a lint issue that somehow slipped through the cracks
bgunnar5 Apr 16, 2024
eace86f
Fix filenames for OpenFoam tutorial (#475)
xorJane Apr 30, 2024
f476a98
bugfix/deep-merge-existing-keys (#476)
bgunnar5 May 10, 2024
dd96092
Improved Info (#477)
lucpeterson May 16, 2024
12f2398
Target is in source's history (#478)
lucpeterson May 16, 2024
897312f
Fix link to merlin banner image (#479)
lucpeterson May 16, 2024
297d9d5
bugfix/status_nested_workspace (#480)
bgunnar5 May 22, 2024
4b4fdee
bugfix/celery-chord-error (#481)
bgunnar5 Jun 5, 2024
f29aabb
release/1.12.2b1 (#482)
bgunnar5 Jun 5, 2024
35c2039
resolve merge conflicts
bgunnar5 Jun 5, 2024
0f6bebf
bugfix/flux-nodes (#484)
bgunnar5 Jun 10, 2024
831bc40
bugfix/flux-nodes-prior-versions (#487)
bgunnar5 Jun 11, 2024
e919ee8
Change Task ID to directory path (#486)
lucpeterson Jun 12, 2024
773ef35
Adding Several New Unit Tests (#490)
bgunnar5 Oct 24, 2024
5bf7516
Merge remote-tracking branch 'upstream-main/main' into main
bgunnar5 Oct 28, 2024
dc0747f
release/1.12.2 (#491)
bgunnar5 Oct 28, 2024
9f6d2ef
resolve merge conflicts
bgunnar5 Oct 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions merlin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,15 @@
import sys


<<<<<<< HEAD
<<<<<<< HEAD
__version__ = "1.10.1"
=======
__version__ = "1.10.3"
>>>>>>> faf71edb866548cf686c2cef0fee559e01db28ce
=======
__version__ = "1.10.2"
>>>>>>> 77d09c3fe40df699e2f37701c07f28ff40c84b65
VERSION = __version__
PATH_TO_PROJ = os.path.join(os.path.dirname(__file__), "")

Expand Down
4 changes: 4 additions & 0 deletions merlin/config/results_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
#
# LLNL-CODE-797170
# All rights reserved.
<<<<<<< HEAD
# This file is part of Merlin, Version: 1.10.3.
=======
# This file is part of Merlin, Version: 1.10.2.
>>>>>>> 77d09c3fe40df699e2f37701c07f28ff40c84b65
#
# For details, see https://github.com/LLNL/merlin.
#
Expand Down