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
=== modified file 'config.yaml'
--- config.yaml 2012-10-02 08:59:22 +0000
+++ config.yaml 2014-09-10 19:44:15 +0000
@@ -14,6 +14,7 @@
14 by ganglia.14 by ganglia.
15 source:15 source:
16 type: string16 type: string
17 default:
17 description: |18 description: |
18 Optional configuration to support use of additional19 Optional configuration to support use of additional
19 sources such as:20 sources such as:
@@ -26,6 +27,7 @@
26 the key configuration option.27 the key configuration option.
27 key:28 key:
28 type: string29 type: string
30 default:
29 description: |31 description: |
30 Key to import to the apt keyring to support use32 Key to import to the apt keyring to support use
31 with arbitary source configuration from outside33 with arbitary source configuration from outside
3234
=== modified file 'metadata.yaml'
--- metadata.yaml 2012-10-02 08:59:22 +0000
+++ metadata.yaml 2014-09-10 19:44:15 +0000
@@ -6,8 +6,11 @@
6 .6 .
7 This charm should be used with the ganglia-node charm to deploy Ganglia7 This charm should be used with the ganglia-node charm to deploy Ganglia
8 for monitoring of other services.8 for monitoring of other services.
9maintainer: Mark Mims <mark.mims@canonical.com>,9categories:
10 James Page <james.page@ubuntu.com>10 - misc
11maintainers:
12 - Mark Mims <mark.mims@canonical.com>
13 - James Page <james.page@ubuntu.com>
11requires:14requires:
12 master:15 master:
13 interface: monitor16 interface: monitor

Subscribers

People subscribed via source and target branches