From: Jun (Nicolas) Hu <jh245g@att.com>
Date: Tue, 14 Aug 2018 13:43:24 +0000 (+0000)
Subject: Merge "Add APPC CDT preload capability"
X-Git-Tag: 3.0.0-ONAP~451
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5055ff1147538a900d9f183069b36f2f84700ef4;p=oom.git

Merge "Add APPC CDT preload capability"
---

5055ff1147538a900d9f183069b36f2f84700ef4
diff --cc kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
index a4f81e6372,a67aa0b629..74f83ad0eb
mode 100644,100755..100644
--- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
diff --cc kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index 763196621f,d0f295639a..06405ce13c
mode 100644,100755..100644
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py