Merge ~smoser/cloud-init:fix/remove-license-for-non-present-boto.py into cloud-init:master

Proposed by Scott Moser
Status: Merged
Approved by: Scott Moser
Approved revision: c225712130ecf2483d607021d7507fac8bd2f4bc
Merged at revision: 946232bb9eda2f4bc66c4464db9e72d3edfd9900
Proposed branch: ~smoser/cloud-init:fix/remove-license-for-non-present-boto.py
Merge into: cloud-init:master
Diff against target: 39 lines (+0/-24)
1 file modified
packages/debian/copyright (+0/-24)
Reviewer Review Type Date Requested Status
Joshua Powers (community) Approve
Server Team CI bot continuous-integration Needs Fixing
cloud-init Commiters Pending
Review via email: mp+331670@code.launchpad.net

Commit message

packages/debian/copyright: remove mention of boto and MIT license

boto_utils.py had been removed some time ago, and the current
cloudinit/ec2_utils.py is not based on what was in boto_utils.

We just failed to remove the mention of it from the upstream
debian/copyright. And then put it back in everywhere in recent changes
to get upstream and ubuntu in sync.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:c225712130ecf2483d607021d7507fac8bd2f4bc
https://jenkins.ubuntu.com/server/job/cloud-init-ci/369/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/369/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Joshua Powers (powersj) wrote :

LGTM

review: Approve
Revision history for this message
Scott Moser (smoser) wrote :

marked approved based on josh. i'll put this in each of ubuntu/devel, ubuntu/zesty, ubuntu/xenial.

Revision history for this message
Scott Moser (smoser) wrote :

ubuntu/devel: 638a93bcca258c3903c78179314051932d44cdf9
  http://git.launchpad.net/cloud-init/commit/?id=638a93bcca

ubuntu/zesty: cd14814b11b634b90178fe08886bce4160523d2b
  http://git.launchpad.net/cloud-init/commit/?id=cd14814b11

ubuntu/xenial: 18dda935c06dc6ccb2968f8a14b9f86e0a0bd3b3
  http://git.launchpad.net/cloud-init/commit/?id=18dda935c0

master: 946232bb9eda2f4bc66c4464db9e72d3edfd9900
  http://git.launchpad.net/cloud-init/commit/?id=946232bb9e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/packages/debian/copyright b/packages/debian/copyright
2index c223670..598cda1 100644
3--- a/packages/debian/copyright
4+++ b/packages/debian/copyright
5@@ -7,10 +7,6 @@ Files: *
6 Copyright: 2010, Canonical Ltd.
7 License: GPL-3 or Apache-2.0
8
9-Files: cloudinit/boto_utils.py
10-Copyright: 2006,2007, Mitch Garnaat http://garnaat.org/
11-License: MIT
12-
13 License: GPL-3
14 This program is free software: you can redistribute it and/or modify
15 it under the terms of the GNU General Public License version 3, as
16@@ -42,23 +38,3 @@ License: Apache-2.0
17 .
18 On Debian-based systems the full text of the Apache version 2.0 license
19 can be found in `/usr/share/common-licenses/Apache-2.0'.
20-
21-License: MIT
22- Permission is hereby granted, free of charge, to any person obtaining a
23- copy of this software and associated documentation files (the
24- "Software"), to deal in the Software without restriction, including
25- without limitation the rights to use, copy, modify, merge, publish, dis-
26- tribute, sublicense, and/or sell copies of the Software, and to permit
27- persons to whom the Software is furnished to do so, subject to the fol-
28- lowing conditions:
29- .
30- The above copyright notice and this permission notice shall be included
31- in all copies or substantial portions of the Software.
32- .
33- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
34- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
35- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
36- SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
37- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
39- IN THE SOFTWARE.

Subscribers

People subscribed via source and target branches