Mojo: Continuous Delivery for Juju

Merge ~mthaddon/mojo/+git/subordinates:changes-to-yaml into ~mojo-maintainers/mojo/+git/subordinates:master

  1. Git
  2. lp:~mthaddon/mojo/+git/subordinates
  3. changes-to-yaml
  4. Merge into master
Proposed by Tom Haddon
Status: Merged
Approved by: Benjamin Allot
Approved revision: 677f98d1318fdff4c4dbbed4a2ce7754e6372fd9
Merged at revision: fcf66b4b12ea8a695cfd67d9e7b84445fb664f83
Proposed branch: ~mthaddon/mojo/+git/subordinates:changes-to-yaml
Merge into: ~mojo-maintainers/mojo/+git/subordinates:master
Diff against target: 15 lines (+3/-1)
1 file modified
README.md (+3/-1)
Reviewer Review Type Date Requested Status
Benjamin Allot Approve
Canonical IS Reviewers Pending
Review via email: mp+401938@code.launchpad.net

Commit message

Add a note in the README about how changes to the charms_to_relate yaml should be proposed as merges to this repo

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
Benjamin Allot (ballot) wrote :

LGTM

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

Change successfully merged at revision fcf66b4b12ea8a695cfd67d9e7b84445fb664f83

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index b52213f..a628656 100644
3--- a/README.md
4+++ b/README.md
5@@ -12,7 +12,9 @@ To do a dryrun, run:
6 mojo run -m manifest-dryrun git+lp:~mojo-maintainers/mojo/+git/subordinates subordinates
7
8 If you're not seeing output showing that charms you're expecting to see related
9-check the contents of `./charms_to_relate.yaml`.
10+check the contents of `./charms_to_relate.yaml`. Changes to this file will
11+need to be proposed as a merge against this repository and go through the
12+usual review channels.
13
14 Once you're happy with the dryrun output, simply run the following against your
15 deployed Juju 2 model:

Subscribers

People subscribed via source and target branches

to all changes: