Skip to content

Commit b4c82b1

Browse files
authored
Merge pull request #12663 from tomponline/tp-license
Change license to AGPLv3
2 parents 4594842 + c527f4b commit b4c82b1

File tree

7 files changed

+671
-211
lines changed

7 files changed

+671
-211
lines changed

AUTHORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Unless mentioned otherwise in a specific file's header, all code in this
2-
project is released under the Apache 2.0 license.
2+
project is released under AGPLv3.
33

44
The list of authors and contributors can be retrieved from the git
55
commit history and in some cases, the file headers.

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ When contributing, you must adhere to the Code of Conduct, which is available at
1212

1313
## License and copyright
1414

15-
By default, any contribution to this project is made under the Apache
16-
2.0 license.
15+
By default, any contribution to this project is made under AGPLv3.
1716

18-
The author of a change remains the copyright holder of their code
19-
(no copyright assignment).
17+
All contributors must sign the [Canonical contributor license agreement](https://ubuntu.com/legal/contributors), which gives Canonical permission to use the contributions. The author of a change remains the copyright holder of their code (no copyright assignment).
18+
19+
All contributions made by Canonical are AGPLv3. Others may be under the Apache 2.0 license.
2020

2121
## Pull requests
2222

COPYING

Lines changed: 661 additions & 202 deletions
Large diffs are not rendered by default.

doc/.wordlist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ AAAA
22
ABI
33
ACL
44
ACLs
5+
AGPLv
56
AIO
67
allocator
78
AMD

doc/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ LXD (<a href="#" title="Listen" onclick="document.getElementById('player').play(
7676

7777
## Project and community
7878

79-
LXD is free software and developed under the [Apache 2 license](https://www.apache.org/licenses/LICENSE-2.0).
79+
LXD is free software and released under [AGPLv3](https://www.gnu.org/licenses/agpl-3.0.en.html).
8080
It’s an open source project that warmly welcomes community projects, contributions, suggestions, fixes and constructive feedback.
8181

8282
The LXD project is sponsored by [Canonical Ltd](https://www.canonical.com).

doc/rest-api.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6217,8 +6217,8 @@ info:
62176217
certificates with a macaroon based (candid) authentication method also
62186218
supported.
62196219
license:
6220-
name: Apache-2.0
6221-
url: https://www.apache.org/licenses/LICENSE-2.0
6220+
name: AGPLv3
6221+
url: https://www.gnu.org/licenses/agpl-3.0.en.html
62226222
title: LXD external REST API
62236223
version: "1.0"
62246224
paths:

lxd/swagger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// supported.
1111
//
1212
// Version: 1.0
13-
// License: Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0
13+
// License: AGPLv3 https://www.gnu.org/licenses/agpl-3.0.en.html
1414
// Contact: LXD upstream <lxd@lists.canonical.com> https://github.com/canonical/lxd
1515
//
1616
// swagger:meta

0 commit comments

Comments
 (0)