Merge ~mthaddon/charm-k8s-openldap/+git/charm-k8s-openldap:ignore-image-scripts into charm-k8s-openldap:master

Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: 04eb9aa28228dc131f01c104ddadae984f368a53
Merged at revision: e9ce83bca39d54908e028345d3d4280267bb1b7e
Proposed branch: ~mthaddon/charm-k8s-openldap/+git/charm-k8s-openldap:ignore-image-scripts
Merge into: charm-k8s-openldap:master
Diff against target: 12 lines (+4/-0)
1 file modified
.jujuignore (+4/-0)
Reviewer Review Type Date Requested Status
Gareth Woolridge Approve
Canonical IS Reviewers Pending
Review via email: mp+391525@code.launchpad.net

Commit message

Exclude image related scripts from the charm built by charmcraft

Description of the change

Exclude image related scripts from the charm built by charmcraft

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
Gareth Woolridge (moon127) wrote :

LGTM

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

Change successfully merged at revision e9ce83bca39d54908e028345d3d4280267bb1b7e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.jujuignore b/.jujuignore
2index b75f70f..d1bf2e0 100644
3--- a/.jujuignore
4+++ b/.jujuignore
5@@ -1,3 +1,7 @@
6 /env
7 *.py[cod]
8 *.charm
9+dockerfile
10+Makefile
11+/image-files
12+/image-scripts

Subscribers

People subscribed via source and target branches

to all changes: