Skip to content

Commit 267eee0

Browse files
authored
Merge pull request
sha_of_the_head_commit
2 parents 25efbf0 + f6e4cf4 commit 267eee0

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,8 @@
274274
- [Load balancing with exported and non-exported resources][Load balancing examples]
275275
4. [Reference - An under-the-hood peek at what the module is doing and how][Reference]
276276
5. [Limitations - OS compatibility, etc.][Limitations]
277-
6. [Development - Guide for contributing to the module][Development]
277+
6. [License][License]
278+
7. [Development - Guide for contributing to the module][Development]
278279

279280
<a id="module-description"></a>
280281
## Module description
@@ -860,6 +861,10 @@ COVERAGE=yes bundle exec rake parallel_spec
860861
Acceptance tests for this module leverage [puppet_litmus](https://github.com/puppetlabs/puppet_litmus).
861862
To run the acceptance tests follow the instructions [here](https://puppetlabs.github.io/litmus/Running-acceptance-tests.html). You can also find a tutorial and walkthrough of using Litmus and the PDK on [YouTube](https://www.youtube.com/watch?v=FYfR7ZEGHoE).
862863

864+
## License
865+
866+
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://opensource.org/license/agpl-v3/), [BSD-2](https://opensource.org/license/bsd-2-clause/), [BSD-3](https://opensource.org/license/bsd-3-clause/), [GPL2.0](https://opensource.org/license/gpl-2-0/), [LGPL](https://opensource.org/license/lgpl-3-0/), [MIT](https://opensource.org/license/mit/) and [MPL](https://opensource.org/license/mpl-2-0/) Licensing.
867+
863868
### Development Support
864869
If you run into an issue with this module, or if you would like to request a feature, please [file a ticket](https://github.com/puppetlabs/puppetlabs-apache/issues).
865870
Every Monday the Puppet IA Content Team has [office hours](https://puppet.com/community/office-hours) in the [Puppet Community Slack](http://slack.puppet.com/), alternating between an EMEA friendly time (1300 UTC) and an Americas friendly time (0900 Pacific, 1700 UTC).

0 commit comments

Comments
 (0)