Merge ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:master into charm-k8s-bind:master

Proposed by Barry Price
Status: Merged
Approved by: Tom Haddon
Approved revision: 05ca5d01a2601a7f2174495ca179d88de863e2eb
Merged at revision: 0ca8a4abdfde75553feb80f771113946119a52d9
Proposed branch: ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:master
Merge into: charm-k8s-bind:master
Diff against target: 11 lines (+1/-0)
1 file modified
.jujuignore (+1/-0)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+392832@code.launchpad.net

Commit message

Don't include .gitignore in the built charm

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

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

Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

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

Change successfully merged at revision 0ca8a4abdfde75553feb80f771113946119a52d9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.jujuignore b/.jujuignore
2index d968a07..e8eb682 100644
3--- a/.jujuignore
4+++ b/.jujuignore
5@@ -1,5 +1,6 @@
6 *~
7 .coverage
8+.gitignore
9 __pycache__
10 /dockerfile
11 /image-scripts/

Subscribers

People subscribed via source and target branches

to all changes: