Merge ~aluria/charm-juju-controller:copyright-charmproof into charm-juju-controller:master

Proposed by Alvaro Uria
Status: Merged
Approved by: Giuseppe Petralia
Approved revision: a87c27009274e79290793a1c2928d233e4d7eb68
Merged at revision: e9121e440e39d4311b82985a6558c306546ef6fc
Proposed branch: ~aluria/charm-juju-controller:copyright-charmproof
Merge into: charm-juju-controller:master
Diff against target: 52 lines (+16/-16)
2 files modified
Makefile (+2/-2)
src/copyright (+14/-14)
Reviewer Review Type Date Requested Status
Giuseppe Petralia Approve
Xav Paice (community) Approve
Review via email: mp+389278@code.launchpad.net

Commit message

Update license, charm proof built code

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Xav Paice (xavpaice) wrote :

LGTM

review: Approve
Revision history for this message
Giuseppe Petralia (peppepetra) wrote :

lgtm

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision e9121e440e39d4311b82985a6558c306546ef6fc

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Makefile b/Makefile
index fd2bbe7..0a84b5f 100644
--- a/Makefile
+++ b/Makefile
@@ -61,9 +61,9 @@ black:
61 @echo "Reformat files with black"61 @echo "Reformat files with black"
62 @cd src && tox -e black62 @cd src && tox -e black
6363
64proof:64proof: build
65 @echo "Running charm proof"65 @echo "Running charm proof"
66 @charm proof src66 @charm proof ${CHARM_BUILD_DIR}/${CHARM_NAME}
6767
68unittests:68unittests:
69 @echo "Running unit tests"69 @echo "Running unit tests"
diff --git a/src/copyright b/src/copyright
index d26af19..ff6b476 100644
--- a/src/copyright
+++ b/src/copyright
@@ -1,16 +1,16 @@
1Format: http://dep.debian.net/deps/dep5/1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
22
3Files: *3Files: *
4Copyright: Copyright 2020, Canonical Ltd.
5License: GPL-3
6 This program is free software: you can redistribute it and/or modify
7 it under the terms of the GNU General Public License version 3, as
8 published by the Free Software Foundation.
9 .
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranties of
12 MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
13 PURPOSE. See the GNU General Public License for more details.
14 .
15 You should have received a copy of the GNU General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17\ No newline at end of file4\ No newline at end of file
5Copyright: 2020, Canonical Ltd.
6License: Apache-2.0
7 Licensed under the Apache License, Version 2.0 (the "License"); you may
8 not use this file except in compliance with the License. You may obtain
9 a copy of the License at
10
11 http://www.apache.org/licenses/LICENSE-2.0
12
13 Unless required by applicable law or agreed to in writing, software
14 distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
15 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
16 License for the specific language governing permissions and limitations
17 under the License.

Subscribers

People subscribed via source and target branches

to all changes: