Merge branch 'main' into cc_workspace

Azure · Nov 23, 2023 · 7c34888 · 7c34888
2 parents b81184b + 2ed339f
commit 7c34888
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/marketplace/solution/marketplace_config.yml b/marketplace/solution/marketplace_config.yml
@@ -134,7 +134,6 @@ slurm:
   slurm_version: "[steps('scheduler').slurmVersion]"
   # CycleCloud for SLURM project version as defined in https://github.com/Azure/cyclecloud-slurm/releases
   cyclecloud_slurm_version: 3.0.4
-
 enroot:
   enroot_version: 3.4.1
 

diff --git a/marketplace/solution/ui_definition.json b/marketplace/solution/ui_definition.json
@@ -563,4 +563,4 @@
       "azhopConfig": {}    
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -563,4 +563,4 @@ @@
           "azhopConfig": {}
         }
       }
-    }
+    }