tree 2af0f4a3e2bb389ff619accad0f16dfca2abc9bc
parent 99bce3b50f1f3e12f37d96448ec66458f2443e4d
parent e1329161a0730f895ebd26ad222f36053089379c
author Marco Miller <marco.miller@ericsson.com> 1578863018 -0500
committer Marco Miller <marco.miller@ericsson.com> 1578865016 -0500

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Replace ExpectedException with assertThrows

Change-Id: Ib9ee3d9fb1467235a9487ecb5ce119f7d41ba7df