Merge branch 'master' into v7.0 22/8922/1 v7.1.0rc1
authorbeierlm <mark.beierl@canonical.com>
Sat, 16 May 2020 00:41:16 +0000 (20:41 -0400)
committerbeierlm <mark.beierl@canonical.com>
Sat, 16 May 2020 00:43:30 +0000 (20:43 -0400)
commitcc0db9ace36de244a1ce66b6694547a75239aa09
treedf8186de1e9ef9f1dfa356b522a1c8ef18b48988
parent80ef8571ea21900bce2d73554c56b1ccbf4c7072
parentf6a4f77b98e5f05b74938b44bcbb2ed148e4941a
Merge branch 'master' into v7.0

Change-Id: I48a508a25fb86c3c2ce480b24053aded97a56f85
Signed-off-by: beierlm <mark.beierl@canonical.com>