File tree Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Original file line number Diff line number Diff line change 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 
Original file line number Diff line number Diff line change 3232  - "Chris Perro (@cmperro)" 
3333  - "Webster Mudge (@wmudge)" 
3434  - "Dan Chaffelson (@chaffelson)" 
35+   - "Chris Perro (@cmperro)" 
3536requirements: 
3637  - cdpy 
3738options: 
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: 
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments