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

Proposed by Haw Loeung
Status: Merged
Approved by: David Lawson
Approved revision: 454ee2b995e7ff13cc19d97bba6fcf4fbf593d7c
Merged at revision: d9866a86f4f4df2efec36e2d6255bdde0fd6c15d
Proposed branch: ~hloeung/jenkins-agent-charm:master
Merge into: jenkins-agent-charm:master
Diff against target: 19 lines (+2/-2)
1 file modified
Makefile (+2/-2)
Reviewer Review Type Date Requested Status
Jenkins CI Charmers Pending
Review via email: mp+364016@code.launchpad.net

Commit message

bzr to git conversion

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
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

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

Change successfully merged at revision d9866a86f4f4df2efec36e2d6255bdde0fd6c15d

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/.bzrignore b/.gitignore
0similarity index 100%0similarity index 100%
1rename from .bzrignore1rename from .bzrignore
2rename to .gitignore2rename to .gitignore
diff --git a/Makefile b/Makefile
index cbd8b5c..e592bf7 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ functionaltest:
2323
24clean:24clean:
25 @echo "Cleaning files"25 @echo "Cleaning files"
26 @if [ -d ./.tox ] ; then rm -r ./.tox ; fi26 @rm -rf ./.tox
27 @if [ -d ./.pytest_cache ] ; then rm -r ./.pytest_cache ; fi27 @rm -rf ./.pytest_cache
2828
29# The targets below don't depend on a file29# The targets below don't depend on a file
30.PHONY: lint test unittest functionaltest clean help30.PHONY: lint test unittest functionaltest clean help

Subscribers

People subscribed via source and target branches