Skip to content

Commit 1f66d39

Browse files
authored
Merge pull request #1408 from puppetlabs/CAT-945-license-update
2 parents 6038c77 + 5516209 commit 1f66d39

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ jobs:
1515
needs: Spec
1616
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
1717
secrets: "inherit"
18+
with:
19+
runs_on: "ubuntu-20.04"

.github/workflows/nightly.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ jobs:
1414
needs: Spec
1515
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
1616
secrets: "inherit"
17-
17+
with:
18+
runs_on: "ubuntu-20.04"

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
1. [Data Types](#data-types)
1111
1. [Facts](#facts)
1212
1. [Limitations](#limitations)
13+
1. [License](#license)
1314
1. [Development](#development)
1415
1. [Contributors](#contributors)
1516

@@ -577,6 +578,10 @@ As of Puppet Enterprise 3.7, the stdlib module is no longer included in PE. PE u
577578

578579
For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-stdlib/blob/main/metadata.json)
579580

581+
## License
582+
583+
This codebase is licensed under the Apache2.0 licensing, however due to the nature of the codebase the open source dependencies may also use a combination of [AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html), [BSD-2](https://opensource.org/license/bsd-2-claus), [BSD-3](https://opensource.org/license/bsd-3-claus), [GPL2.0](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html), [LGPL](https://opensource.org/license/lgpl-3-0/), [MIT](https://opensource.org/license/mit/) and [MPL](https://opensource.org/license/mpl-2-0/) Licensing.
584+
580585
## Development
581586

582587
Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve. We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things. For more information, see our [module contribution guide](https://github.com/puppetlabs/puppetlabs-stdlib/blob/main/CONTRIBUTING.md).

0 commit comments

Comments
 (0)