Skip to content

Commit ca5eab8

Browse files
authored
Merge branch 'develop' into readme_updates
2 parents f11b5d9 + e55f047 commit ca5eab8

File tree

9 files changed

+295
-128
lines changed

9 files changed

+295
-128
lines changed

CODE_OF_CONDUCT.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
## Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at oss@splunk.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
CONTRIBUTING
2+
3+
By submitting a Contribution to this Work, You agree that Your Contribution is made subject to the primary LICENSE
4+
file applicable to this Work. In addition, You represent that: (i) You are the copyright owner of the Contribution
5+
or (ii) You have the requisite rights to make the Contribution.
6+
7+
Definitions:
8+
9+
“You” shall mean: (i) yourself if you are making a Contribution on your own behalf; or (ii) your company,
10+
if you are making a Contribution on behalf of your company. If you are making a Contribution on behalf of your
11+
company, you represent that you have the requisite authority to do so.
12+
13+
"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing
14+
work, that is intentionally submitted by You for inclusion in, or documentation of, this project/repository. For the
15+
purposes of this definition, "submitted" means any form of electronic, verbal, or written communication submitted for
16+
inclusion in this project/repository, including but not limited to communication on electronic mailing lists, source
17+
code control systems, and issue tracking systems that are managed by, or on behalf of, the maintainers of
18+
the project/repository.
19+
20+
“Work” shall mean the collective software, content, and documentation in this project/repository.

LICENSE

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,37 @@
198198
distributed under the License is distributed on an "AS IS" BASIS,
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201-
limitations under the License.
201+
limitations under the License.
202+
203+
=======================================================================
204+
Splunk Connect for Docker Subcomponents:
205+
206+
The Splunk Connect for Docker project contains subcomponents with separate copyright
207+
notices and license terms. Your use of the source code for the these
208+
subcomponents is subject to the terms and conditions of the following
209+
licenses.
210+
211+
========================================================================
212+
Apache License 2.0
213+
========================================================================
214+
The following components are provided under the Apache License 2.0. See project link for details.
215+
216+
(Apache License 2.0) logger, ioutils, urlutils, logdriver (https://github.com/moby/moby/blob/master/LICENSE)
217+
(Apache License 2.0) fifo (https://github.com/containerd/fifo/blob/master/LICENSE)
218+
(Apache License 2.0) go-plugin-helpers (https://github.com/docker/go-plugins-helpers/blob/master/LICENSE)
219+
220+
========================================================================
221+
MIT licenses
222+
========================================================================
223+
The following components are provided under the MIT License. See project link for details.
224+
225+
(MIT License) logrus (https://github.com/sirupsen/logrus/blob/master/LICENSE)
226+
227+
========================================================================
228+
BSD-style licenses
229+
========================================================================
230+
231+
The following components are provided under a BSD-style license. See project link for details.
232+
233+
(BSD 2-Clause "Simplified" License) errors (https://github.com/pkg/errors/blob/master/LICENSE)
234+
(BSD 3-Clause) protobuf/io (https://github.com/gogo/protobuf/blob/master/LICENSE)

0 commit comments

Comments
 (0)