Merge lp:~aisrael/charms/precise/mysql/fix-charm-lint into lp:charms/mysql

Proposed by Adam Israel
Status: Merged
Merged at revision: 127
Proposed branch: lp:~aisrael/charms/precise/mysql/fix-charm-lint
Merge into: lp:charms/mysql
Diff against target: 41 lines (+4/-2)
2 files modified
config.yaml (+2/-0)
hooks/shared_db_relations.py (+2/-2)
To merge this branch: bzr merge lp:~aisrael/charms/precise/mysql/fix-charm-lint
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review Queue (community) automated testing Approve
Review via email: mp+237755@code.launchpad.net

Description of the change

Fix charm proof warnings and lint errors so that the charm will pass automated testing.

To post a comment you must log in.
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://reports.vapour.ws/charm-tests/charm-bundle-test-1267-results

review: Approve (automated testing)
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config.yaml'
--- config.yaml 2014-05-08 11:23:53 +0000
+++ config.yaml 2014-10-09 10:19:53 +0000
@@ -80,6 +80,7 @@
80 your ceph cluster).80 your ceph cluster).
81 source:81 source:
82 type: string82 type: string
83 default:
83 description: |84 description: |
84 Optional configuration to support use of additional sources such as:85 Optional configuration to support use of additional sources such as:
85 .86 .
@@ -91,6 +92,7 @@
91 option.92 option.
92 key:93 key:
93 type: string94 type: string
95 default:
94 description: |96 description: |
95 Key ID to import to the apt keyring to support use with arbitary source97 Key ID to import to the apt keyring to support use with arbitary source
96 configuration from outside of Launchpad archives or PPA's.98 configuration from outside of Launchpad archives or PPA's.
9799
=== modified file 'hooks/shared_db_relations.py'
--- hooks/shared_db_relations.py 2014-06-02 19:52:50 +0000
+++ hooks/shared_db_relations.py 2014-10-09 10:19:53 +0000
@@ -94,7 +94,7 @@
94 # nova_database=xxx nova_username=xxx nova_hostname=xxx94 # nova_database=xxx nova_username=xxx nova_hostname=xxx
95 # quantum_database=xxx quantum_username=xxx quantum_hostname=xxx95 # quantum_database=xxx quantum_username=xxx quantum_hostname=xxx
96 # create96 # create
97 #{97 # {
98 # "nova": {98 # "nova": {
99 # "username": xxx,99 # "username": xxx,
100 # "database": xxx,100 # "database": xxx,
@@ -105,7 +105,7 @@
105 # "database": xxx,105 # "database": xxx,
106 # "hostname": xxx106 # "hostname": xxx
107 # }107 # }
108 #}108 # }
109 #109 #
110 databases = {}110 databases = {}
111 for k, v in settings.iteritems():111 for k, v in settings.iteritems():

Subscribers

People subscribed via source and target branches

to all changes: