From 238446dffe0c9805f58ff9b008f775967e7cb0d1 Mon Sep 17 00:00:00 2001
From: Ali Mohammed <ali.mohammed@hpe.com>
Date: Fri, 13 Aug 2021 12:25:48 +0200
Subject: [PATCH] add distlayout attributes to maestro-core schema
---
attributes/maestro-core.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/attributes/maestro-core.yaml b/attributes/maestro-core.yaml
index f228d5d9..3b594fbb 100644
--- a/attributes/maestro-core.yaml
+++ b/attributes/maestro-core.yaml
@@ -137,6 +137,7 @@ maestro-attributes:
documentation: Indicates that the CDO data are distributed among various
maestro compoenets. Users are not expected to utilize or
set this attribute.
+<<<<<<< HEAD
#FIXME only support now irregular_1D dist layout
- key: "cdo.dist-layout"
@@ -146,6 +147,8 @@ maestro-attributes:
documentation: The CDO data distribution among various
maestro compoenets.
+=======
+>>>>>>> 5b1f05e (add distlayout attributes to maestro-core schema)
## Lifetime related
# - key: "cdo.lifetime"
--
GitLab