2 Commits

Author SHA1 Message Date
James Page
264b0885e8 Resync charmhelpers for licensing change
The charm-helpers project have re-licensed to Apache 2.0
inline with the agreed licensing approach to intefaces,
layers and charms generally.

Resync helpers to bring charmhelpers inline with charm
codebase.

Change-Id: I99e94eec42adc19ab92b14a20e59cc60360e0b58
2016-07-06 16:44:39 +01:00
Adam Collard
3475df472c Merge from -next 2015-08-06 11:48:37 +01:00