merge from devel

radical-cybertools · Jan 17, 2024 · cf00894 · cf00894
2 parents 781fdb5 + c9c9339
commit cf00894
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -7,6 +7,12 @@ For a list of open issues and known problems, see:
 
 This is the latest release - if uncertain, use this release.
 
+--------------------------------------------------------------------------------
+### 1.46.1 Hotfix-Release                                             2024-01-17
+
+  - fix type for `LFS_SIZE_PER_NODE`
+
+
 --------------------------------------------------------------------------------
 ### 1.46.0 Release                                                    2024-01-11
 

diff --git a/VERSION b/VERSION
@@ -1 +1,5 @@
+<<<<<<< HEAD
 1.47.0
+=======
+1.46.1
+>>>>>>> master
diff --git a/src/radical/pilot/resource_config.py b/src/radical/pilot/resource_config.py
@@ -126,7 +126,7 @@ class ResourceConfig(ru.TypedDict):
         PYTHON_INTERPRETER     : str         ,
         LAUNCH_METHODS         : {str: None} ,
         LFS_PATH_PER_NODE      : str         ,
-        LFS_SIZE_PER_NODE      : str         ,
+        LFS_SIZE_PER_NODE      : int         ,
         TASK_TMP               : str         ,
         MEM_PER_NODE           : int         ,
         CORES_PER_NODE         : int         ,
@@ -174,7 +174,7 @@ class ResourceConfig(ru.TypedDict):
         PYTHON_INTERPRETER     : ''          ,
         LAUNCH_METHODS         : dict()      ,
         LFS_PATH_PER_NODE      : ''          ,
-        LFS_SIZE_PER_NODE      : ''          ,
+        LFS_SIZE_PER_NODE      : 0           ,
         TASK_TMP               : ''          ,
         MEM_PER_NODE           : 0           ,
         CORES_PER_NODE         : 0           ,