HPCE/gitea-pages
0
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Activity

improve some admonishment titles
All checks were successful
Build and deploy documentation / build-and-deploy-docs (push) Successful in 25s
Details

Browse Source
This commit is contained in:
viessm_h
2026-01-23 15:25:23 +01:00
parent 76c2b407f3
commit 6812bb6bad
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/merlin6/introduction.md
View File

@@ -1,7 +1,8 @@
# Introduction # Introduction
!!! note !!! failure "Deprecated"
Merlin6 is no longer accessible for new users! Please have a look at [Merlin 7](../merlin7/01-Quick-Start-Guide/introduction.md) instead. Merlin6 is no longer accessible for new users! Please have a look at
[Merlin 7](../merlin7/01-Quick-Start-Guide/introduction.md) instead.
## Slurm clusters ## Slurm clusters
@@ -10,7 +11,8 @@ Comprised the **`merlin6`** CPU cluster and the
cluster (formally called [**`merlin5`**](../merlin5/cluster-introduction.md) is cluster (formally called [**`merlin5`**](../merlin5/cluster-introduction.md) is
kept active with best effort support. kept active with best effort support.
From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job submitted from the login node will be submitted to that cluster if not. From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job
submitted from the login node will be submitted to that cluster if not.
* Users can keep submitting to the old *`merlin5`* computing nodes by using the option ``--cluster=merlin5``. * Users can keep submitting to the old *`merlin5`* computing nodes by using the option ``--cluster=merlin5``.
* Users submitting to the **`gmerlin6`** GPU cluster need to specify the option ``--cluster=gmerlin6``. * Users submitting to the **`gmerlin6`** GPU cluster need to specify the option ``--cluster=gmerlin6``.
@@ -18,6 +20,6 @@ From July 2019, **`merlin6`** becomes the **default Slurm cluster** and any job
### Slurm 'merlin6' ### Slurm 'merlin6'
**CPU nodes** are configured in a **Slurm** cluster, called **`merlin6`**, and **CPU nodes** are configured in a **Slurm** cluster, called **`merlin6`**, and
this is the ***default Slurm cluster***. Hence, by default, if no Slurm cluster is this is the ***default Slurm cluster***. Hence, by default, if no Slurm cluster
specified (with the `--cluster` option), this will be the cluster to which the jobs is specified (with the `--cluster` option), this will be the cluster to which
will be sent. the jobs will be sent.

2
docs/merlin7/02-How-To-Use-Merlin/merlin_tools.md
View File

@@ -93,7 +93,7 @@ be tracked. In theory any (or all available projects) can be tracked, but due to
UNIX and Lustre permissions, accessing quotas information for a project you're not UNIX and Lustre permissions, accessing quotas information for a project you're not
a member of **is not possible**. a member of **is not possible**.
!!! tip !!! tip "Updating the project config"
If you are added/removed from a project, you can update this config file by If you are added/removed from a project, you can update this config file by
calling `merlin_quotas genconf --all-projects --force`. The calling `merlin_quotas genconf --all-projects --force`. The
`--all-projects` will fully check your possible membership to all projects, `--all-projects` will fully check your possible membership to all projects,