tree bd7932b71978a2fe7b222bd48974cad3473bf401
parent 8842bce656804c741b5d004d3f11d68758c5f35f
parent 2b6416dc0b4528b6bd7f4401e45345c9ecf036a5
author Marco Miller <marco.miller@ericsson.com> 1579036386 -0500
committer Marco Miller <marco.miller@ericsson.com> 1579036386 -0500

Merge branch 'stable-3.0'

* stable-3.0:
  Replace ExpectedException with assertThrows
  Add .apt_generated to .gitignore

Change-Id: Id9cfdc934cb08a21bb9584aab897953ddbda1ef6