diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-08 00:30:24 +0800 |
|---|---|---|
| committer | shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-08 00:30:24 +0800 |
| commit | 23f466831a8284433609e9f770737830d0b448bf (patch) | |
| tree | 10c1d23a845026a0499b9a011b5ca30e3883de54 /tosca2heat/heat-translator/translator/osc | |
| parent | fa544e8fbbf3b8d5cfe0dc82090f0de6d7599524 (diff) | |
Emergence merged for unit test.
Reversed merged caused the unit test error, i think this
is the ci system's bug.
Change-Id: I6d29f7f11cc0a78c695f179aa30c93545a575584
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/heat-translator/translator/osc')
0 files changed, 0 insertions, 0 deletions