Merge lp:~gary/charms/precise/juju-gui/fix-charm-proof into lp:~juju-gui/charms/precise/juju-gui/trunk

Proposed by Gary Poster
Status: Merged
Merged at revision: 27
Proposed branch: lp:~gary/charms/precise/juju-gui/fix-charm-proof
Merge into: lp:~juju-gui/charms/precise/juju-gui/trunk
Diff against target: 36 lines (+18/-1)
2 files modified
copyright (+17/-0)
metadata.yaml (+1/-1)
To merge this branch: bzr merge lp:~gary/charms/precise/juju-gui/fix-charm-proof
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+143963@code.launchpad.net

Description of the change

Fix charm according to "charm proof"

Add copyright file and maintainer, and remove "juju" key.

https://codereview.appspot.com/7131063/

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

Reviewers: mp+143963_code.launchpad.net,

Message:
Please take a look.

Description:
Fix charm according to "charm proof"

Add copyright file and maintainer, and remove "juju" key.

https://code.launchpad.net/~gary/charms/precise/juju-gui/fix-charm-proof/+merge/143963

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/7131063/

Affected files:
   A [revision details]
   A copyright
   M metadata.yaml

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision: <email address hidden>

Index: copyright
=== added file 'copyright'
--- copyright 1970-01-01 00:00:00 +0000
+++ copyright 2013-01-18 22:47:52 +0000
@@ -0,0 +1,17 @@
+Format: http://dep.debian.net/deps/dep5/
+
+Files: *
+Copyright: Copyright 2011, Canonical Ltd., All Rights Reserved.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file

Index: metadata.yaml
=== modified file 'metadata.yaml'
--- metadata.yaml 2012-11-19 12:15:36 +0000
+++ metadata.yaml 2013-01-18 22:47:52 +0000
@@ -1,7 +1,7 @@
-juju: charm
  name: juju-gui
  summary: User interface for Juju (development)
  description: Web GUI for Juju
  provides:
    web:
      interface: http
+maintainer: Juju GUI Team <email address hidden>
\ No newline at end of file

Revision history for this message
Francesco Banconi (frankban) wrote :

Thanks Gary, this branch fixes all the errors and warnings found by
`charm proof`. The only remaining output is:
I: relation web has no hooks
... but that's just an info message.
To double check, I run the tests and deployed the charm: everything
works well.
So, land with just the minor below.
I can take care of landing this branch after the second review is done.

https://codereview.appspot.com/7131063/diff/1/copyright
File copyright (right):

https://codereview.appspot.com/7131063/diff/1/copyright#newcode4
copyright:4: Copyright: Copyright 2011, Canonical Ltd., All Rights
Reserved.
Maybe 2013?

https://codereview.appspot.com/7131063/

Revision history for this message
Brad Crittenden (bac) wrote :

Looks good to land after the copyright change.

https://codereview.appspot.com/7131063/

27. By Francesco Banconi

Fix charm according to "charm proof"

Add copyright file and maintainer, and remove "juju" key.
Landing Gary's branch.

R=
CC=
https://codereview.appspot.com/7182044

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'copyright'
2--- copyright 1970-01-01 00:00:00 +0000
3+++ copyright 2013-01-18 22:50:29 +0000
4@@ -0,0 +1,17 @@
5+Format: http://dep.debian.net/deps/dep5/
6+
7+Files: *
8+Copyright: Copyright 2011, Canonical Ltd., All Rights Reserved.
9+License: GPL-3
10+ This program is free software: you can redistribute it and/or modify
11+ it under the terms of the GNU General Public License as published by
12+ the Free Software Foundation, either version 3 of the License, or
13+ (at your option) any later version.
14+ .
15+ This program is distributed in the hope that it will be useful,
16+ but WITHOUT ANY WARRANTY; without even the implied warranty of
17+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+ GNU General Public License for more details.
19+ .
20+ You should have received a copy of the GNU General Public License
21+ along with this program. If not, see <http://www.gnu.org/licenses/>.
22\ No newline at end of file
23
24=== modified file 'metadata.yaml'
25--- metadata.yaml 2012-11-19 12:15:36 +0000
26+++ metadata.yaml 2013-01-18 22:50:29 +0000
27@@ -1,7 +1,7 @@
28-juju: charm
29 name: juju-gui
30 summary: User interface for Juju (development)
31 description: Web GUI for Juju
32 provides:
33 web:
34 interface: http
35+maintainer: Juju GUI Team <juju-gui@lists.launchpad.net>
36\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: