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

Standardize Copyright Disclaimer in of all the *.cs Files #4930

Closed
wants to merge 4 commits into from
Closed

Standardize Copyright Disclaimer in of all the *.cs Files #4930

wants to merge 4 commits into from

Conversation

MeenuyD
Copy link

@MeenuyD MeenuyD commented Oct 6, 2023

In alignment with OpenTelemetry practices (examples https://github.com/open-telemetry/opentelemetry-demo/blob/f44860602656e2313f3cfe6f7e42a464a341786b/src/cartservice/src/Program.cs#L1C1-L2C39 and
https://github.com/open-telemetry/opentelemetry-cpp/blob/ad626cec4598165e0d297b0bdb3880968c5dfe88/api/include/opentelemetry/config.h#L1-L2), simplified the copyright disclaimer in all *.cs files to the format:

// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
This standardizes the copyright information and aligns it with our common practices across OpenTelemetry projects.
#4900

@MeenuyD MeenuyD requested a review from a team October 6, 2023 23:22
@utpilla
Copy link
Contributor

utpilla commented Oct 6, 2023

@MeenuyD Please resolve the merge conflicts.

@utpilla
Copy link
Contributor

utpilla commented Oct 13, 2023

@MeenuyD Could you please confirm if you're still planning to work on this PR?

@MeenuyD
Copy link
Author

MeenuyD commented Oct 13, 2023

Yes I am am working on this

@MeenuyD
Copy link
Author

MeenuyD commented Oct 13, 2023

I have changed all the .cs file copyright can you please review

@reyang
Copy link
Member

reyang commented Oct 13, 2023

I have changed all the .cs file copyright can you please review

Could you resolve the merge conflicts?

image

@github-actions
Copy link
Contributor

This PR was marked stale due to lack of activity and will be closed in 7 days. Commenting or Pushing will instruct the bot to automatically remove the label. This bot runs once per day.

@github-actions github-actions bot added the Stale Issues and pull requests which have been flagged for closing due to inactivity label Oct 21, 2023
@MeenuyD
Copy link
Author

MeenuyD commented Oct 21, 2023

Hello @reyang can you please guide how can resolve these conflicts

@github-actions github-actions bot removed the Stale Issues and pull requests which have been flagged for closing due to inactivity label Oct 22, 2023
@github-actions
Copy link
Contributor

This PR was marked stale due to lack of activity and will be closed in 7 days. Commenting or Pushing will instruct the bot to automatically remove the label. This bot runs once per day.

@github-actions github-actions bot added the Stale Issues and pull requests which have been flagged for closing due to inactivity label Oct 30, 2023
Copy link
Member

@alanwest alanwest left a comment

Choose a reason for hiding this comment

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

@MeenuyD I resolved the conflicts on your branch. You will need to pull latest.

For future reference, read up on merge conflicts and how to resolve them: https://docs.github.com/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts

There are still quite a few files that still have the old copyright header. These need to be fixed.

@github-actions github-actions bot removed the Stale Issues and pull requests which have been flagged for closing due to inactivity label Nov 2, 2023
Copy link
Contributor

This PR was marked stale due to lack of activity and will be closed in 7 days. Commenting or Pushing will instruct the bot to automatically remove the label. This bot runs once per day.

@github-actions github-actions bot added the Stale Issues and pull requests which have been flagged for closing due to inactivity label Nov 10, 2023
@github-actions github-actions bot removed the Stale Issues and pull requests which have been flagged for closing due to inactivity label Nov 11, 2023
Copy link
Contributor

This PR was marked stale due to lack of activity and will be closed in 7 days. Commenting or Pushing will instruct the bot to automatically remove the label. This bot runs once per day.

@github-actions github-actions bot added the Stale Issues and pull requests which have been flagged for closing due to inactivity label Nov 19, 2023
Copy link
Contributor

Closed as inactive. Feel free to reopen if this PR is still being worked on.

@github-actions github-actions bot closed this Nov 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Stale Issues and pull requests which have been flagged for closing due to inactivity
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants