{"payload":{"feedbackUrl":"https://github.com/orgs/community/discussions/53140","repo":{"id":222809980,"defaultBranch":"develop","name":"merlin","ownerLogin":"LLNL","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2019-11-19T23:31:13.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/5921419?v=4","public":true,"private":false,"isOrgOwned":true},"refInfo":{"name":"","listCacheKey":"v0:1716567522.0","currentOid":""},"activityList":{"items":[{"before":"f29aabbb0231dc22405b1ca16558433d1f3fb4b3","after":"35c20395a54c2199f98de9251bf49ca88d2d17ea","ref":"refs/heads/develop","pushedAt":"2024-06-05T17:53:33.000Z","pushType":"push","commitsCount":2,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"},"commit":{"message":"resolve merge conflicts","shortMessageHtmlLink":"resolve merge conflicts"}},{"before":"4b4fdeeb4cd6cee4f7d126fdd546feedc5fa0abb","after":"f29aabbb0231dc22405b1ca16558433d1f3fb4b3","ref":"refs/heads/develop","pushedAt":"2024-06-05T16:57:02.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"},"commit":{"message":"release/1.12.2b1 (#482)\n\n* remove a merge conflict statement that was missed\r\n\r\n* bump version to 1.12.2b1","shortMessageHtmlLink":"release/1.12.2b1 (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2336378168\" data-permission-text=\"Title is private\" data-url=\"https://github.com/LLNL/merlin/issues/482\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/LLNL/merlin/pull/482/hovercard\" href=\"https://github.com/LLNL/merlin/pull/482\">#482</a>)"}},{"before":"297d9d5382f26e680699b4c902383b3ff644058d","after":"4b4fdeeb4cd6cee4f7d126fdd546feedc5fa0abb","ref":"refs/heads/develop","pushedAt":"2024-06-05T15:34:10.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"},"commit":{"message":"bugfix/celery-chord-error (#481)\n\n* remove a merge conflict statement that was missed\r\n\r\n* add celery results backend patch to stop ChordErrors\r\n\r\n* add MERLIN_RAISE_ERROR return code\r\n\r\n* add tests to ensure chord error isn't raised\r\n\r\n* add RAISE_ERROR to docs\r\n\r\n* update CHANGELOG\r\n\r\n* fix lint issues\r\n\r\n* up the sleep time on the chord error test\r\n\r\n* add new steps to the chord err test spec\r\n\r\n* add tree statement to the new test for debugging\r\n\r\n* upping sleep time to see if that fixes github action for python 3.7\r\n\r\n* change sleep time for new test based on python version\r\n\r\n* run fix style\r\n\r\n* remove specific sleep time for diff python versions","shortMessageHtmlLink":"bugfix/celery-chord-error (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2316229003\" data-permission-text=\"Title is private\" data-url=\"https://github.com/LLNL/merlin/issues/481\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/LLNL/merlin/pull/481/hovercard\" href=\"https://github.com/LLNL/merlin/pull/481\">#481</a>)"}},{"before":"1d701f937c87364e25e57868c64cbea81cf11d52","after":"f292d3aca8d42087a46de85b43c317a118797bb5","ref":"refs/heads/feature/scriptadapter_ignored","pushedAt":"2024-05-24T16:29:53.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"koning","name":"Joe Koning","path":"/koning","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/455297?s=80&v=4"},"commit":{"message":"Run fix-style","shortMessageHtmlLink":"Run fix-style"}},{"before":"9185a01041b444b76b41b7dfa8511abafac9cd0e","after":"1d701f937c87364e25e57868c64cbea81cf11d52","ref":"refs/heads/feature/scriptadapter_ignored","pushedAt":"2024-05-24T16:23:32.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"koning","name":"Joe Koning","path":"/koning","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/455297?s=80&v=4"},"commit":{"message":"Use els branch for log.debug message.","shortMessageHtmlLink":"Use els branch for log.debug message."}},{"before":null,"after":"9185a01041b444b76b41b7dfa8511abafac9cd0e","ref":"refs/heads/feature/scriptadapter_ignored","pushedAt":"2024-05-24T16:18:42.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"koning","name":"Joe Koning","path":"/koning","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/455297?s=80&v=4"},"commit":{"message":"Ignore shell in parallel command construction","shortMessageHtmlLink":"Ignore shell in parallel command construction"}},{"before":"897312fda2265d59a639c6fa28126401d7d4266d","after":"297d9d5382f26e680699b4c902383b3ff644058d","ref":"refs/heads/develop","pushedAt":"2024-05-22T19:54:41.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"},"commit":{"message":"bugfix/status_nested_workspace (#480)\n\n* remove a merge conflict statement that was missed\r\n\r\n* have status ignore nested workspaces and modify merge rules\r\n\r\n* update CHANGELOG\r\n\r\n* fixed issue with escape sequences in ascii art\r\n\r\n* apply Luc's suggestion\r\n\r\n* add setuptools as a requirement since python 3.12 doesn't have it natively\r\n\r\n* modify unit tests for status to use pytest rather than unittest\r\n\r\n* update CHANGELOG\r\n\r\n* add fixtures for status testing and add nested workflow test\r\n\r\n* update CHANGELOG","shortMessageHtmlLink":"bugfix/status_nested_workspace (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2301351540\" data-permission-text=\"Title is private\" data-url=\"https://github.com/LLNL/merlin/issues/480\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/LLNL/merlin/pull/480/hovercard\" href=\"https://github.com/LLNL/merlin/pull/480\">#480</a>)"}},{"before":"12f239870cd8dc2da07b4f672be2ea67813712c1","after":"897312fda2265d59a639c6fa28126401d7d4266d","ref":"refs/heads/develop","pushedAt":"2024-05-16T19:44:48.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"},"commit":{"message":"Fix link to merlin banner image (#479)","shortMessageHtmlLink":"Fix link to merlin banner image (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2301055681\" data-permission-text=\"Title is private\" data-url=\"https://github.com/LLNL/merlin/issues/479\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/LLNL/merlin/pull/479/hovercard\" href=\"https://github.com/LLNL/merlin/pull/479\">#479</a>)"}},{"before":"dd96092fd46aaf4b2db65c8679e901a9c2b12450","after":"12f239870cd8dc2da07b4f672be2ea67813712c1","ref":"refs/heads/develop","pushedAt":"2024-05-16T17:38:04.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"},"commit":{"message":"Target is in source's history (#478)\n\n* New github action test to make sure target has been merged into source","shortMessageHtmlLink":"Target is in source's history (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2300940320\" data-permission-text=\"Title is private\" data-url=\"https://github.com/LLNL/merlin/issues/478\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/LLNL/merlin/pull/478/hovercard\" href=\"https://github.com/LLNL/merlin/pull/478\">#478</a>)"}},{"before":"ca128c01d8d71589abe4bcb09fd566f73581d300","after":null,"ref":"refs/heads/design_optimization_template","pushedAt":"2024-05-16T17:02:31.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"768ac789811e15ea628b20d76bd524575badd6a6","after":null,"ref":"refs/heads/release/1.8.4","pushedAt":"2024-05-16T17:02:30.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"ec42de4357490116a804a183106be164f1d70211","after":null,"ref":"refs/heads/bugfix/mubarka1/sample_gen_err","pushedAt":"2024-05-16T17:02:28.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"08d358472e7b018ecb2d7896e77745b538806b7d","after":null,"ref":"refs/heads/bugfix/mubarka1/readthedocs","pushedAt":"2024-05-16T17:02:25.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"ec46358dc2bcc75d48936a2058d190dbe6ca42b8","after":null,"ref":"refs/heads/revert-314-develop","pushedAt":"2024-05-16T17:02:18.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"6ddf9484ea9bad009ebdcffdb57d0cee0070b7d4","after":null,"ref":"refs/heads/refactor/ben/click","pushedAt":"2024-05-16T17:02:16.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"9ae743df1ba242da109cdfd7617eb21169cab960","after":null,"ref":"refs/heads/feature/ben/server_bool","pushedAt":"2024-05-16T17:02:14.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"95cd5f6766777359eea0a5632294a48dab94fba6","after":null,"ref":"refs/heads/refactor/ben/decouple_from_maestro_2","pushedAt":"2024-05-16T17:02:12.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"151d10c3ce2e6d4db30a2d2e88452ddf41e1e0a0","after":null,"ref":"refs/heads/refactor/ben/decouple_from_maestro","pushedAt":"2024-05-16T17:02:11.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"dc95a645ddb94585f7a9b14e75ed0a429ef25855","after":null,"ref":"refs/heads/tests/ben/gitlab_ci","pushedAt":"2024-05-16T17:02:10.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"342531bbf956d8f2349027ea82f7863fc07966b5","after":null,"ref":"refs/heads/refactor/ben/override_maestro_validation","pushedAt":"2024-05-16T17:02:08.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"72ca24ca816a74e7f7075513f6491b0847827871","after":null,"ref":"refs/heads/bugfix/ben/serializer","pushedAt":"2024-05-16T17:02:06.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"0c9775a62936b980cc45a93d1088ad1311591dd9","after":null,"ref":"refs/heads/PR","pushedAt":"2024-05-16T17:01:27.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"de4aa80a66b91b7dc09aa32e9ab21332f2236df7","after":null,"ref":"refs/heads/feature/auto_publish","pushedAt":"2024-05-16T17:01:24.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"6cc0a10218c86d0f7a061a6a97ea71eb0df52750","after":null,"ref":"refs/heads/feature/better_info","pushedAt":"2024-05-16T17:01:06.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"}},{"before":"f476a98514f6ce3e4b8c67f61dd0c519b789374c","after":"dd96092fd46aaf4b2db65c8679e901a9c2b12450","ref":"refs/heads/develop","pushedAt":"2024-05-16T16:57:22.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"},"commit":{"message":"Improved Info (#477)\n\n* Add merlin version to banner\r\n\r\n* Add python package info to and clean up 'merlin info'\r\n\r\n* Add some unit tests\r\n\r\n* Force GitHub runner checkout to grab the whole history, fixing CHANGELOG test bug\r\n\r\n* Update CHANGELOG to show bugfix to CHANGELOG test","shortMessageHtmlLink":"Improved Info (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2299095641\" data-permission-text=\"Title is private\" data-url=\"https://github.com/LLNL/merlin/issues/477\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/LLNL/merlin/pull/477/hovercard\" href=\"https://github.com/LLNL/merlin/pull/477\">#477</a>)"}},{"before":null,"after":"6cc0a10218c86d0f7a061a6a97ea71eb0df52750","ref":"refs/heads/feature/better_info","pushedAt":"2024-05-16T04:40:53.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"lucpeterson","name":"Luc Peterson","path":"/lucpeterson","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/588868?s=80&v=4"},"commit":{"message":"Updating github action for CHANGELOG check","shortMessageHtmlLink":"Updating github action for CHANGELOG check"}},{"before":"eace86fbc355654dd5868ba0a6401995cbc0de84","after":"f476a98514f6ce3e4b8c67f61dd0c519b789374c","ref":"refs/heads/develop","pushedAt":"2024-05-10T16:03:49.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"},"commit":{"message":"bugfix/deep-merge-existing-keys (#476)\n\n* remove a merge conflict statement that was missed\r\n\r\n* add a 'pip freeze' call in github workflow to view reqs versions\r\n\r\n* remove DeepMergeException and add conflict_handler to dict_deep_merge\r\n\r\n* add conflict handler to dict_deep_merge\r\n\r\n* fix broken tests for detailed-status\r\n\r\n* use caplog fixture rather than IO stream\r\n\r\n* add ability to define module-specific fixtures\r\n\r\n* add tests for read/write status files and conlict handling\r\n\r\n* add caplog explanation to docstrings\r\n\r\n* update CHANGELOG\r\n\r\n* run fix-style\r\n\r\n* add pytest-mock as dependency for test suite\r\n\r\n* clean up input check in dict_deep_merge","shortMessageHtmlLink":"bugfix/deep-merge-existing-keys (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2285965104\" data-permission-text=\"Title is private\" data-url=\"https://github.com/LLNL/merlin/issues/476\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/LLNL/merlin/pull/476/hovercard\" href=\"https://github.com/LLNL/merlin/pull/476\">#476</a>)"}},{"before":"ce58c6e0a71c2220f3f511974cb1027a9790f87c","after":"a1a6c19d3a5a67f5ae2043f43f97771930fb45be","ref":"refs/heads/feature/celery_multi","pushedAt":"2024-05-07T22:35:25.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"koning","name":"Joe Koning","path":"/koning","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/455297?s=80&v=4"},"commit":{"message":"Run flake8.","shortMessageHtmlLink":"Run flake8."}},{"before":null,"after":"ce58c6e0a71c2220f3f511974cb1027a9790f87c","ref":"refs/heads/feature/celery_multi","pushedAt":"2024-05-07T22:19:21.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"koning","name":"Joe Koning","path":"/koning","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/455297?s=80&v=4"},"commit":{"message":"The new 'multi' merlin resource keyword is available to start multiple celery workers on a node. Setting this variable to True will start the celery workers as daemons.","shortMessageHtmlLink":"The new 'multi' merlin resource keyword is available to start multipl…"}},{"before":"bba68abba4fdf425c638163b79004afe2518915b","after":null,"ref":"refs/tags/1.12.1","pushedAt":"2024-05-02T21:49:36.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"bgunnar5","name":"Brian Gunnarson","path":"/bgunnar5","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/49216024?s=80&v=4"}}],"hasNextPage":true,"hasPreviousPage":false,"activityType":"all","actor":null,"timePeriod":"all","sort":"DESC","perPage":30,"cursor":"djE6ks8AAAAEXWoPsgA","startCursor":null,"endCursor":null}},"title":"Activity · LLNL/merlin"}