tree 3369faa915ef73323e786fc46a9ee36dcd93d701
parent 06e8d50f0c9ffd37e97e67b0bbfcd8aa1fb82a00
parent c5ba01e75eb718f13f01a5311b34d149ee570f2f
author David Pursehouse <dpursehouse@collab.net> 1578962654 +0900
committer David Pursehouse <dpursehouse@collab.net> 1578962654 +0900

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Replace ExpectedException with assertThrows

Change-Id: Ifde0515e354b2eeeece666da2ec6ac8cd857b33f