tree d7d199c4a514901544559eface84bdc09f336754
parent 5adfd1b25084b1fab335284796f041a405e1a640
parent 21bc4b9702902fbfa6f682aa97771b58a327d1ba
author David Pursehouse <dpursehouse@collab.net> 1561942723 +0900
committer David Pursehouse <dpursehouse@collab.net> 1561945427 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  BaseInit: Don't fail if unable to upgrade schema for slave

Change-Id: I6ca830a99e20dd8fcf80787ee90083d8d03844b8