merging lp:~gandelman-a/charms/precise/nova-compute/nrpe_interface as per https://code.launchpad.net/~gandelman-a/charms/precise/nova-compute/nrpe_interface/+merge/171211

2013-07-14 13:35:19 -06:00 · 2013-07-14 13:35:19 -06:00 · 265005b827
commit 265005b827
parent 117b856fce cdbc8c7229
2 changed files with 4 additions and 4 deletions
--- a/metadata.yaml
+++ b/metadata.yaml
@ -8,9 +8,6 @@ description: |
 provides:
  cloud-compute:
    interface: nova-compute
-  nrpe-external-master:
-    interface: nrpe-external-master
-    scope: container
 requires:
  shared-db:
    interface: mysql-shared
@ -20,6 +17,9 @@ requires:
    interface: glance
  ceph:
    interface: ceph-client
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container
 peers:
  compute-peer:
    interface: nova
--- a/2
+++ b/2
@ -1 +1 @@
-91
+92