Skip to content

Commit a8b8108

Browse files
committed
Updates for PR comments. Add authorship. Update some docs. etc.
Signed-off-by: Chris Perro <cmperro@gmail.com>
1 parent 631fcdb commit a8b8108

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

plugins/modules/datahub_cluster.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@
195195
name: datahub-name
196196
env: name-or-crn
197197
state: present
198-
definition: definition-name
199198
subnet: subnet-id-for-cloud-provider
200199
image: image-uuid-from-catalog
201200
catalog: name-of-catalog-for-image

plugins/modules/datahub_definition_info.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,20 @@
3232
- "Chris Perro (@cmperro)"
3333
- "Webster Mudge (@wmudge)"
3434
- "Dan Chaffelson (@chaffelson)"
35+
- "Chris Perro (@cmperro)"
3536
requirements:
3637
- cdpy
3738
options:
3839
name:
3940
description:
41+
<<<<<<< HEAD
4042
- If a name or CRN is provided, that Definition will be described.
4143
- If no name or CRN is provided, all Definitions will be listed.
44+
=======
45+
- If a name is provided, that Definition will be described.
46+
- If a crn is provided, that Definition will be described.
47+
- If no name provided, all Definitions will be listed.
48+
>>>>>>> Updates for PR comments. Add authorship. Update some docs. etc.
4249
type: str
4350
required: False
4451
aliases:

0 commit comments

Comments
 (0)