Merge ~hloeung/jenkins-slave-charm:master into jenkins-slave-charm:master

Proposed by Haw Loeung on 2019-03-06
Status: Merged
Approved by: David Lawson on 2019-03-06
Approved revision: 454ee2b995e7ff13cc19d97bba6fcf4fbf593d7c
Merged at revision: d9866a86f4f4df2efec36e2d6255bdde0fd6c15d
Proposed branch: ~hloeung/jenkins-slave-charm:master
Merge into: jenkins-slave-charm:master
Diff against target: 19 lines (+2/-2)
1 file modified
Makefile (+2/-2)
Reviewer Review Type Date Requested Status
Jenkins CI Charmers 2019-03-06 Pending
Review via email:

Commit message

bzr to git conversion

To post a comment you must log in.

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

Change cannot be self approved, setting status to needs review.

Change successfully merged at revision d9866a86f4f4df2efec36e2d6255bdde0fd6c15d

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.bzrignore b/.gitignore
2similarity index 100%
3rename from .bzrignore
4rename to .gitignore
5diff --git a/Makefile b/Makefile
6index cbd8b5c..e592bf7 100644
7--- a/Makefile
8+++ b/Makefile
9@@ -23,8 +23,8 @@ functionaltest:
11 clean:
12 @echo "Cleaning files"
13- @if [ -d ./.tox ] ; then rm -r ./.tox ; fi
14- @if [ -d ./.pytest_cache ] ; then rm -r ./.pytest_cache ; fi
15+ @rm -rf ./.tox
16+ @rm -rf ./.pytest_cache
18 # The targets below don't depend on a file
19 .PHONY: lint test unittest functionaltest clean help


People subscribed via source and target branches