| commit | f143ae8ce9b587faabca9055c5af6b0c898a7473 | [log] [tgz] |
|---|---|---|
| author | dis <dis@srv09-kha.kha.mirantis.net> | Thu Nov 24 11:39:01 2016 +0200 |
| committer | dis <dis@srv09-kha.kha.mirantis.net> | Thu Nov 24 11:39:01 2016 +0200 |
| tree | aa0cfcb2c4760049a13c14fee0817151c99ee0c5 | |
| parent | 45ea5fd3cab4a518b1b8b2a0d79f51362e6aa092 [diff] | |
| parent | b1df9e23949268306ea831a0db4fac0ab38a99c7 [diff] |
Merge branch 'master' of https://github.com/dis-xcom/tcp-qa Conflicts: tcp_tests/templates/salt/mk22-qa-lab01-salt.yaml