| commit | 2f9bfd430876981a75b0dde9d9840e24d51e592e | [log] [tgz] |
|---|---|---|
| author | dis <dis@srv09-kha.kha.mirantis.net> | Thu Nov 24 11:42:37 2016 +0200 |
| committer | dis <dis@srv09-kha.kha.mirantis.net> | Thu Nov 24 11:42:37 2016 +0200 |
| tree | 8c3032318bc1608f75957070c41b2247b348892d | |
| parent | 1bd460ce0e2acfbac8dae87d664da9804b81b3c2 [diff] | |
| parent | f143ae8ce9b587faabca9055c5af6b0c898a7473 [diff] |
Merge branch 'master' of https://github.com/dis-xcom/tcp-qa Conflicts: tcp_tests/templates/salt/mk22-qa-lab01-salt.yaml