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

Add simplified_bsd.txt license file #4759

Merged
merged 2 commits into from
Jun 2, 2022

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

It was referenced in some files, but wasn't there.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

collection licenses

@ansibullbot ansibullbot added bug This issue/PR relates to a bug cloud docs_fragments docs_fragments plugin (shared docs) module_utils module_utils plugins plugin (any type) remote_management storage tests tests unit tests/unit needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Jun 2, 2022
@felixfontein felixfontein merged commit 0be68bf into ansible-collections:main Jun 2, 2022
@patchback
Copy link

patchback bot commented Jun 2, 2022

Backport to stable-3: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 0be68bf on top of patchback/backports/stable-3/0be68bf04bd9b8dcf99583ebf5ad6deac4736283/pr-4759

Backporting merged PR #4759 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-3/0be68bf04bd9b8dcf99583ebf5ad6deac4736283/pr-4759 upstream/stable-3
  4. Now, cherry-pick PR Add simplified_bsd.txt license file #4759 contents into that branch:
    $ git cherry-pick -x 0be68bf04bd9b8dcf99583ebf5ad6deac4736283
    If it'll yell at you with something like fatal: Commit 0be68bf04bd9b8dcf99583ebf5ad6deac4736283 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 0be68bf04bd9b8dcf99583ebf5ad6deac4736283
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add simplified_bsd.txt license file #4759 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-3/0be68bf04bd9b8dcf99583ebf5ad6deac4736283/pr-4759
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein deleted the simplified-bsd branch June 2, 2022 05:30
@ansibullbot ansibullbot removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR label Jun 2, 2022
@patchback
Copy link

patchback bot commented Jun 2, 2022

Backport to stable-4: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4/0be68bf04bd9b8dcf99583ebf5ad6deac4736283/pr-4759

Backported as #4760

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Jun 2, 2022
* Add simplified_bsd.txt and adjust references.

* Add changelog.

(cherry picked from commit 0be68bf)
@patchback
Copy link

patchback bot commented Jun 2, 2022

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/0be68bf04bd9b8dcf99583ebf5ad6deac4736283/pr-4759

Backported as #4761

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Jun 2, 2022
* Add simplified_bsd.txt and adjust references.

* Add changelog.

(cherry picked from commit 0be68bf)
felixfontein added a commit that referenced this pull request Jun 2, 2022
* Add simplified_bsd.txt and adjust references.

* Add changelog.

(cherry picked from commit 0be68bf)
felixfontein added a commit that referenced this pull request Jun 2, 2022
* Add simplified_bsd.txt and adjust references.

* Add changelog.

(cherry picked from commit 0be68bf)
felixfontein added a commit that referenced this pull request Jun 2, 2022
* Add simplified_bsd.txt and adjust references.

* Add changelog.

(cherry picked from commit 0be68bf)
felixfontein added a commit that referenced this pull request Jun 2, 2022
* Add simplified_bsd.txt and adjust references.

* Add changelog.

(cherry picked from commit 0be68bf)

Co-authored-by: Felix Fontein <[email protected]>
felixfontein added a commit that referenced this pull request Jun 2, 2022
* Add simplified_bsd.txt and adjust references.

* Add changelog.

(cherry picked from commit 0be68bf)

Co-authored-by: Felix Fontein <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue/PR relates to a bug cloud docs_fragments docs_fragments plugin (shared docs) module_utils module_utils plugins plugin (any type) remote_management storage tests tests unit tests/unit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants