Merge lp:~tvansteenburgh/charms/precise/ganglia/fix-proof into lp:charms/ganglia

Proposed by Tim Van Steenburgh
Status: Merged
Merged at revision: 33
Proposed branch: lp:~tvansteenburgh/charms/precise/ganglia/fix-proof
Merge into: lp:charms/ganglia
Diff against target: 37 lines (+7/-2)
2 files modified
config.yaml (+2/-0)
metadata.yaml (+5/-2)
To merge this branch: bzr merge lp:~tvansteenburgh/charms/precise/ganglia/fix-proof
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+234196@code.launchpad.net

Description of the change

Fix proof.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2012-10-02 08:59:22 +0000
3+++ config.yaml 2014-09-10 19:44:15 +0000
4@@ -14,6 +14,7 @@
5 by ganglia.
6 source:
7 type: string
8+ default:
9 description: |
10 Optional configuration to support use of additional
11 sources such as:
12@@ -26,6 +27,7 @@
13 the key configuration option.
14 key:
15 type: string
16+ default:
17 description: |
18 Key to import to the apt keyring to support use
19 with arbitary source configuration from outside
20
21=== modified file 'metadata.yaml'
22--- metadata.yaml 2012-10-02 08:59:22 +0000
23+++ metadata.yaml 2014-09-10 19:44:15 +0000
24@@ -6,8 +6,11 @@
25 .
26 This charm should be used with the ganglia-node charm to deploy Ganglia
27 for monitoring of other services.
28-maintainer: Mark Mims <mark.mims@canonical.com>,
29- James Page <james.page@ubuntu.com>
30+categories:
31+ - misc
32+maintainers:
33+ - Mark Mims <mark.mims@canonical.com>
34+ - James Page <james.page@ubuntu.com>
35 requires:
36 master:
37 interface: monitor

Subscribers

People subscribed via source and target branches