Juju Lint

Merge ~mertkirpici/juju-lint:lp/2033523 into juju-lint:master

  1. Git
  2. lp:~mertkirpici/juju-lint
  3. lp/2033523
  4. Merge into master
Proposed by Mert Kirpici
Status: Merged
Approved by: Andrea Ieri
Approved revision: ff2e324d47697510fdddef2c8434a76c4e7097a0
Merged at revision: 45480fcd2c5e73e0f4697d2c6ad14854515c4df7
Proposed branch: ~mertkirpici/juju-lint:lp/2033523
Merge into: juju-lint:master
Diff against target: 51 lines (+2/-3)
3 files modified
contrib/canonical-rules.yaml (+1/-1)
contrib/includes/operations.yaml (+1/-1)
contrib/includes/saas.yaml (+0/-1)
Reviewer Review Type Date Requested Status
Andrea Ieri Approve
Erhan Sunar (community) Approve
🤖 prod-jenkaas-bootstack continuous-integration Approve
Review via email: mp+451439@code.launchpad.net

Commit message

LP #2033523

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
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:ff2e324d47697510fdddef2c8434a76c4e7097a0
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/16/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1804/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/517/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/16//rebuild

review: Approve (continuous-integration)
Revision history for this message
Erhan Sunar (esunar) wrote :

LGTM

review: Approve
Revision history for this message
Andrea Ieri (aieri) wrote :

lgtm

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

Change successfully merged at revision 45480fcd2c5e73e0f4697d2c6ad14854515c4df7

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/contrib/canonical-rules.yaml b/contrib/canonical-rules.yaml
2index e32abcd..05982c5 100644
3--- a/contrib/canonical-rules.yaml
4+++ b/contrib/canonical-rules.yaml
5@@ -123,7 +123,6 @@ operations mandatory: &operations-mandatory-charms
6 - elasticsearch
7 - grafana
8 - graylog
9- - landscape-server
10 - nagios
11 - prometheus2
12
13@@ -131,6 +130,7 @@ operations optional: &operations-optional-charms
14 - infra-node
15 - cloudstats
16 - juju-lint
17+ - landscape-server
18
19 operations openstack mandatory: &operations-openstack-mandatory-charms
20 - openstack-service-checks
21diff --git a/contrib/includes/operations.yaml b/contrib/includes/operations.yaml
22index f51d02f..5c2b9a6 100644
23--- a/contrib/includes/operations.yaml
24+++ b/contrib/includes/operations.yaml
25@@ -2,7 +2,6 @@ operations mandatory: &operations-mandatory-charms
26 - elasticsearch
27 - grafana
28 - graylog
29- - landscape-server
30 - nagios
31 - prometheus2
32
33@@ -10,6 +9,7 @@ operations optional: &operations-optional-charms
34 - infra-node
35 - cloudstats
36 - juju-lint
37+ - landscape-server
38
39 operations openstack mandatory base: &operations-openstack-mandatory-base
40 - openstack-service-checks
41diff --git a/contrib/includes/saas.yaml b/contrib/includes/saas.yaml
42index a3ed08f..bac2ea5 100644
43--- a/contrib/includes/saas.yaml
44+++ b/contrib/includes/saas.yaml
45@@ -2,6 +2,5 @@ saas:
46 - elasticsearch
47 - grafana
48 - graylog
49- - landscape-server
50 - nagios
51 - prometheus2

Subscribers

People subscribed via source and target branches