diff options
| author |   Michael Lando <ml636r@att.com> | 2017-06-11 14:22:02 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-06-11 17:48:32 +0300 |
| commit | b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 (patch) | |
| tree | 0609319203be13f6c29ccbe24cb39c9d64f90095 /catalog-be/src/main/resources/import | |
| parent | af9929df75604ce407d0ca542b200630164e0ae6 (diff) | |
[SDC-29] rebase continue work to align source
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-be/src/main/resources/import')
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml | 13 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip | bin | 5243 -> 5277 bytes |
2 files changed, 13 insertions, 0 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml index b4c442f3df..63d70c699e 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml @@ -21,6 +21,19 @@ map: json: derived_from: tosca.datatypes.Root + +scalar-unit: + derived_from: tosca.datatypes.Root + +scalar-unit.size: + derived_from: scalar-unit + +scalar-unit.time: + derived_from: scalar-unit + +scalar-unit.frequency: + derived_from: scalar-unit + tosca.datatypes.Credential: derived_from: tosca.datatypes.Root diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip Binary files differindex 4f3e269c69..9c5964df1d 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip |