tree 223ae0dcd60eb3e28d33b7c9f33e1d96a5907376
parent e54775ed72622900bd442f45170e5c9f600ec5aa
parent 8c6e35d908acf0970e15359c7e1c08971b91635e
author David Pursehouse <dpursehouse@collab.net> 1546904740 +0900
committer David Pursehouse <dpursehouse@collab.net> 1546904740 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  ElasticContainer: Use 7.0.0-alpha2

Change-Id: I3ac909ab9e19da41e2c2b03b966f4abc507c3c54