Resolved conflicts

Author: userlocalhost

CHANGES.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v1.9.0
+* Added an action (list_slb_http_templates) to show SLB http-template.
+
 ## v1.8.0
 * Enabled to set health_check parameter at the add_slb_server action.
 

actions/list_slb_http_templates_v21.yaml

@@ -0,0 +1,29 @@
+---
+name: list_slb_http_templates_v21
+runner_type: python-script
+description: lists HTTP Template entries which are registered in SLB
+enabled: true
+entry_point: ax_action_runner.py
+parameters:
+    action:
+        type: string
+        immutable: true
+        default: all
+    object_path:
+        type: string
+        immutable: true
+        default: slb.template.http_templates
+    name:
+        type: string
+        immutable: true
+        default: ''
+    one_target:
+        type: boolean
+        immutable: true
+        default: false
+    appliance:
+        type: string
+        description: The appliance information to connect, which is specified at the 'appliance' parameter in the configuration.
+    specified_target:
+        type: object
+        description: "Specify the target dynamically, (key: 'target', 'api_version', 'userid', 'passwd')"

pack.yaml

@@ -7,7 +7,7 @@ keywords:
   - load balancer
   - ADC
   - network
-version: 1.8.0
+version: 1.9.0
 author: Hiroyasu OHYAMA
 email: [email protected]
 python_versions: