Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring jaeger operator repo inline with contributing guidelines in mai… #664

Merged
merged 2 commits into from
Sep 19, 2019
Merged

Conversation

objectiser
Copy link
Contributor

…n Jaeger repo

As mentioned in #663 (comment), the DCO instructions aren't clear - so have copied the CONTRIBUTING_GUIDELINES.md from jaeger repo, and removed the DCO section from the current CONTRIBUTING.md, to make the jaeger-operator repo more consistent with the jaeger repo. Also added the missing referenced DCO file.

Signed-off-by: Gary Brown [email protected]

simplest solution is to squash the commits into one and sign it. For example,
suppose that your branch history looks like this:

```
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is currently a straight copy of the jaeger repo version, which makes updating eaiser - but means the list of commits here given as example are related to that repo. Not sure it matters as just used for illustration.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it matters.

@@ -0,0 +1,157 @@
# How to Contribute to Jaeger
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Originally I appended "Operator" to this title and in a few other places. But decided to revert as the instructions basically relate to all jaeger repos. They are just here for convenience.

Copy link
Contributor

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apart from the year in the license header example, LGTM.

make sure the year is current and the copyright says "The Jaeger Authors".

```
// Copyright (c) 2018 The Jaeger Authors.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not something to fix here, but at the source. The year probably needs to be updated ;)

simplest solution is to squash the commits into one and sign it. For example,
suppose that your branch history looks like this:

```
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it matters.

Signed-off-by: Gary Brown <[email protected]>
@objectiser objectiser merged commit e377c2b into jaegertracing:master Sep 19, 2019
@objectiser objectiser deleted the contrib branch September 19, 2019 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants