Merge ~vultaire/charm-telegraf:copyright into charm-telegraf:master

Proposed by Paul Goins
Status: Merged
Approved by: Alvaro Uria
Approved revision: dc40e08bf902da73211247f123304f6c8e102029
Merged at revision: 32c00bbbcd310e78e00bf653bac975fcd98217ce
Proposed branch: ~vultaire/charm-telegraf:copyright
Merge into: charm-telegraf:master
Diff against target: 32 lines (+11/-11)
1 file modified
src/copyright (+11/-11)
Reviewer Review Type Date Requested Status
Alvaro Uria Approve
Tom Haddon Approve
Giuseppe Petralia Approve
Review via email: mp+389308@code.launchpad.net

Commit message

Changed license to Apache 2.

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

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

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

lgtm

review: Approve
Revision history for this message
Tom Haddon (mthaddon) wrote :

Seems fine to me, I understand this is a change that's been asked for by Bootstack Mgmt.

review: Approve
Revision history for this message
Alvaro Uria (aluria) wrote :

+1

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

Change successfully merged at revision 32c00bbbcd310e78e00bf653bac975fcd98217ce

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/copyright b/src/copyright
2index 2b4a912..78fb061 100644
3--- a/src/copyright
4+++ b/src/copyright
5@@ -1,16 +1,16 @@
6 Format: http://dep.debian.net/deps/dep5/
7
8 Files: *
9-Copyright: Copyright 2011-2015, Canonical Ltd.
10-License: GPL-3
11- This program is free software: you can redistribute it and/or modify
12- it under the terms of the GNU General Public License version 3, as
13- published by the Free Software Foundation.
14+Copyright: Copyright 2011-2020, Canonical Ltd., All Rights Reserved.
15+License: Apache License 2.0
16+ Licensed under the Apache License, Version 2.0 (the "License");
17+ you may not use this file except in compliance with the License.
18+ You may obtain a copy of the License at
19 .
20- This program is distributed in the hope that it will be useful,
21- but WITHOUT ANY WARRANTY; without even the implied warranties of
22- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
23- PURPOSE. See the GNU General Public License for more details.
24+ http://www.apache.org/licenses/LICENSE-2.0
25 .
26- You should have received a copy of the GNU General Public License
27- along with this program. If not, see <http://www.gnu.org/licenses/>.
28+ Unless required by applicable law or agreed to in writing, software
29+ distributed under the License is distributed on an "AS IS" BASIS,
30+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
31+ See the License for the specific language governing permissions and
32+ limitations under the License.

Subscribers

People subscribed via source and target branches