Merge ~alejdg/mojo/+git/mojo-specs:patch-1 into ~alejdg/mojo/+git/mojo-specs:master
Proposed by
Alexandre Gomes
| Status: | Superseded |
|---|---|
| Proposed branch: | ~alejdg/mojo/+git/mojo-specs:patch-1 |
| Merge into: | ~alejdg/mojo/+git/mojo-specs:master |
| Diff against target: |
866 lines (+422/-84) (has conflicts) 37 files modified
charm-testing/canonical-livepatch/deploy (+3/-0) charm-testing/content-cache/deploy (+9/-10) charm-testing/influxdb/deploy (+0/-2) charm-testing/mailman3-core/collect (+8/-0) charm-testing/mailman3-core/deploy (+58/-0) charm-testing/mailman3-core/files/arbitrary_config (+47/-0) charm-testing/mailman3-core/files/check-lists.conf (+13/-0) charm-testing/mailman3-core/files/policyd-spf.conf (+10/-0) charm-testing/mailman3-core/templates/check_list_settings.py.tmpl (+84/-0) charm-testing/mm-pd-bot/manifest (+1/-0) charm-testing/prometheus/deploy (+3/-1) charm-testing/ubuntu-advantage/applications.yaml (+18/-0) charm-testing/ubuntu-advantage/install-hello (+3/-0) charm-testing/ubuntu-advantage/manifest (+20/-0) charm-testing/ubuntu-advantage/print-attachment (+3/-0) charm-testing/ubuntu-advantage/print-hello (+3/-0) charm-testing/ubuntu-advantage/relations.yaml (+13/-0) charm-testing/ubuntu-advantage/reset-token (+3/-0) charm-testing/ubuntu-repository-cache/collect (+2/-2) charm-testing/wordpress/bundle.yaml (+10/-0) charm-testing/wordpress/manifest (+2/-0) dev/null (+0/-20) mojo-how-to/README (+7/-13) mojo-how-to/configs/mojo-how-to-production-vhost-https.template (+3/-5) mojo-how-to/devel/bundle-relations (+3/-0) mojo-how-to/devel/bundle-services (+24/-0) mojo-how-to/devel/collect (+0/-6) mojo-how-to/devel/services (+3/-0) mojo-how-to/manifest (+2/-4) mojo-how-to/manifest-production (+19/-0) mojo-how-to/production/bundle-relations (+6/-0) mojo-how-to/production/bundle-services (+34/-0) mojo-how-to/production/collect (+0/-17) mojo-how-to/production/post-deploy (+2/-2) mojo-how-to/production/services (+3/-0) pkg-jenkins-canonical/bundle.yaml (+0/-1) pkg-jenkins-canonical/get-jenkins-admin-monitors (+3/-1) Conflict in charm-testing/canonical-livepatch/deploy Conflict in mojo-how-to/devel/bundle-services Conflict in mojo-how-to/devel/services Conflict in mojo-how-to/production/bundle-services Conflict in mojo-how-to/production/services |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexandre Gomes | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
