tree 6d3b63fb2b0f82e1984da05fc6d10bda4b150e4f
parent 27d87184834808e7df5e47b2d952919900eadf4f
parent 1153c5bc03bb313413bcf177c9be7bc1ce7ccc14
author David Pursehouse <dpursehouse@collab.net> 1560926006 +0900
committer David Pursehouse <dpursehouse@collab.net> 1560926006 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix the version of postgresql used in the test container
  Factor creation of test container out to a common method

Change-Id: I324887b6651714cbc3537ebfdcfac33c22f0b26c