tree 55c8f5da33dabe83f2f77665ce77d39e95230a03
parent 6dd667d3262ff111851f0f68a59d2ad0ff30dcd8
parent 4afcefcaa4f4bdac11e1cfcf5ad8d1be69213f61
author Marco Miller <marco.miller@ericsson.com> 1578869015 -0500
committer Marco Miller <marco.miller@ericsson.com> 1578949433 -0500

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Replace ExpectedException with assertThrows

Change-Id: Ia0894e859af350687826b3d449beb2bed7b1ed1c