| commit | 52037a4a47be9c88c2ee999bd10040da8322d73d | [log] [tgz] |
|---|---|---|
| author | Tatyana Leontovich <tleontovich@mirantis.com> | Fri Apr 07 13:57:54 2017 +0300 |
| committer | Tatyana Leontovich <tleontovich@mirantis.com> | Fri Apr 07 14:51:24 2017 +0300 |
| tree | 6fd7a6f3ec6f2c5d1650e313e230818294901ccf | |
| parent | b7404593b5a6575637a4c6c0074ce0a76815e470 [diff] | |
| parent | f67089ee4f7044524ae27b9492da7590049d5409 [diff] |
Merge branch 'add_1_0' of https://github.com/Mirantis/tcp-qa into add_1_0 Conflicts: tcp_tests/templates/underlay/mcp-fuel-aio.yaml
diff --git a/tcp_tests/templates/underlay/mcp-fuel-aio.yaml b/tcp_tests/templates/underlay/mcp-fuel-aio.yaml index c189e12..547865c 100644 --- a/tcp_tests/templates/underlay/mcp-fuel-aio.yaml +++ b/tcp_tests/templates/underlay/mcp-fuel-aio.yaml
@@ -31,7 +31,7 @@ ip_ranges: dhcp: [+90, -10] - privat-pool01: + private-pool01: net: 192.168.10.0/24:24 params: ip_reserved: