tree 7b2f924ecb6a71432778169411455a72c3697a4c
parent fe3993ff9fe92f0dbb3540699feaff29fe518272
parent afa08d72a4331ad987ae844c113ba4cd420b588a
author David Pursehouse <dpursehouse@collab.net> 1585366429 +0900
committer David Pursehouse <dpursehouse@collab.net> 1585366429 +0900

Merge branch 'stable-3.1'

* stable-3.1:
  e2e-tests: Update Dockerfile gatling_git_version to 1.0.10
  e2e-tests: Align gatling version with gatling-git
  e2e-tests: Introduce reused gatling version constant
  Set version to 3.1.5-SNAPSHOT
  Set version to 3.1.4

Change-Id: Iaf4e8d788b98b26142dd9d4aa94f08f872a8d507