tree 8c3032318bc1608f75957070c41b2247b348892d
parent 1bd460ce0e2acfbac8dae87d664da9804b81b3c2
parent f143ae8ce9b587faabca9055c5af6b0c898a7473
author dis <dis@srv09-kha.kha.mirantis.net> 1479980557 +0200
committer dis <dis@srv09-kha.kha.mirantis.net> 1479980557 +0200

Merge branch 'master' of https://github.com/dis-xcom/tcp-qa

Conflicts:
	tcp_tests/templates/salt/mk22-qa-lab01-salt.yaml