Merge ~canonical-is-bootstack/layer-snap:revert/4361980 into ~stub/layer-snap:master

Proposed by Alvaro Uria
Status: Merged
Merged at revision: adbfb80a7a08490f7a6eb72ae0db41b3908baf39
Proposed branch: ~canonical-is-bootstack/layer-snap:revert/4361980
Merge into: ~stub/layer-snap:master
Diff against target: 5 lines (+0/-0)
1 file modified
dev/null (+0/-0)
Reviewer Review Type Date Requested Status
Stuart Bishop Approve
Review via email: mp+397254@code.launchpad.net

Description of the change

Commit 4361980 creates an empty lib/charms/layer/__init__.py which conflicts with layer:basic __init__.py copied in the same place.

The change effectively breaks any charm using both layers. Since the change was on hold for 3 years, I think it is safe to roll it back.

The other change made by the same commit was on setup.py, which has been subsequently updated so no change is made there.

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) :
review: Approve
Revision history for this message
Stuart Bishop (stub) wrote :

Yup, thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/charms/layer/__init__.py b/lib/charms/layer/__init__.py
2deleted file mode 100644
3index e69de29..0000000
4--- a/lib/charms/layer/__init__.py
5+++ /dev/null

Subscribers

People subscribed via source and target branches