| commit | 70ade787fef61e88b5117d96c64e4674c877efb8 | [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 13:57:54 2017 +0300 |
| tree | ff49475cba9d45b58f888d71f29c646b12fcf1c4 | |
| 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