Merge branch 'master' of https://github.com/dis-xcom/tcp-qa
Conflicts:
tcp_tests/templates/salt/mk22-qa-lab01-salt.yaml
diff --git a/tcp_tests/templates/salt/mk22-qa-lab01-salt.yaml b/tcp_tests/templates/salt/mk22-qa-lab01-salt.yaml
index f651ee4..aba8288 100644
--- a/tcp_tests/templates/salt/mk22-qa-lab01-salt.yaml
+++ b/tcp_tests/templates/salt/mk22-qa-lab01-salt.yaml
@@ -124,7 +124,7 @@
retry: {count: 3, delay: 10}
skip_fail: false
-- description: Workaround for VMs: set low 'max_heap_size' for Cassandra
+- description: Workaround set low max_heap_size for Cassandra
cmd: |
cat << 'EOF' >> /srv/salt/reclass/classes/system/linux/system/single.yml
# opencontrail lowmem