Merge ~hloeung/content-cache-charm:cleanup into content-cache-charm:master

Proposed by Haw Loeung
Status: Merged
Approved by: Colin Misare
Approved revision: 1b9e0f33300cbc0e48955c68b1db4014db128546
Merged at revision: b9645dc0f11b87ce263f47bfa71156b4ca4daf0e
Proposed branch: ~hloeung/content-cache-charm:cleanup
Merge into: content-cache-charm:master
Diff against target: 13 lines (+1/-1)
1 file modified
Makefile (+1/-1)
Reviewer Review Type Date Requested Status
Colin Misare Approve
Canonical IS Reviewers Pending
Review via email: mp+398750@code.launchpad.net

Commit message

Be sure to clean up .juju-persistent-config, especially when building charms

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Colin Misare (cmisare) wrote :

LGTM

review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision b9645dc0f11b87ce263f47bfa71156b4ca4daf0e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index ee9e4d7..b85fa22 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -53,7 +53,7 @@ clean:
6 @rm -rf ./.tox
7 @rm -rf ./.pytest_cache
8 @rm -rf ./tests/unit/__pycache__ ./reactive/__pycache__ ./lib/__pycache__
9- @rm -rf ./.coverage ./.unit-state.db
10+ @rm -rf ./.coverage ./.juju-persistent-config ./.unit-state.db
11
12 # The targets below don't depend on a file
13 .PHONY: lint test unittest functionaltest build clean help

Subscribers

People subscribed via source and target branches