tree 8c3032318bc1608f75957070c41b2247b348892d
parent 45ea5fd3cab4a518b1b8b2a0d79f51362e6aa092
parent b1df9e23949268306ea831a0db4fac0ab38a99c7
author dis <dis@srv09-kha.kha.mirantis.net> 1479980341 +0200
committer dis <dis@srv09-kha.kha.mirantis.net> 1479980527 +0200

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

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