tree cd8b4386a3e34c49e43011361d9bae271e707ad3
parent 9e71aa4e1278b078594bb1a9a2c142a3b724c8c0
parent 8a36bc6a8f2b046a373af5a90c5311dc23a9ca63
author Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> 1622554656 -0400
committer Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> 1622554656 -0400

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  e2e-tests: Refactor scenarios to use ClusterDefault
  e2e-tests: Add configurable cluster_port property

Change-Id: I2a03231a3e400d101ee9d1972d3a46953276e322