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

Refresh #7786 #9873

Open
wants to merge 1 commit into
base: bugfix/api-runtime-object-sync-order
Choose a base branch
from

Conversation

ymartin-ovh
Copy link

Refresh contribution in #7786

Regards

@cla-bot
Copy link

cla-bot bot commented Oct 6, 2023

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: Henrik Triem.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email [email protected]
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@icinga-probot icinga-probot bot added area/api REST API area/configuration DSL, parser, compiler, error handling bug Something isn't working cla/signed core/quality Improve code, libraries, algorithms, inline docs labels Oct 6, 2023
@cla-bot
Copy link

cla-bot bot commented Oct 6, 2023

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: Henrik Triem.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email [email protected]
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@Al2Klimov
Copy link
Member

Sorry, the bot is wrong. Please, on your branch, run git reset --hard f48cd6b19292c3c9eba5a6b2f1169f68ccfcefe0 and git push -f.

@cla-bot
Copy link

cla-bot bot commented Oct 9, 2023

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: Henrik Triem.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email [email protected]
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@cla-bot
Copy link

cla-bot bot commented Oct 9, 2023

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: Henrik Triem.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email [email protected]
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@Al2Klimov Al2Klimov changed the base branch from master to bugfix/api-runtime-object-sync-order October 9, 2023 14:20
@Al2Klimov
Copy link
Member

@cla-bot check

@cla-bot cla-bot bot added the cla/signed label Oct 9, 2023
@Al2Klimov
Copy link
Member

What's the matter? You ran the command and I've even approved the PR. Why the additional force push? Sorry, but now you have to do this to fix this:

@ymartin-ovh
Copy link
Author

What's the matter? You ran the command and I've even approved the PR. Why the additional force push? Sorry, but now you have to do this to fix this:

* `git rebase -i e627dcce1bdfa48acd9b3bdf6a2bf4254e89ab43`

* An editor will show up
  
  * remove all lines except your commit "Adapt [WIP: Change the order of the API runtime object sync on reconnect #7786](https://github.com/Icinga/icinga2/pull/7786) to the new ConfigItem::CommitNewItems()"
  * save
  * exit

* `git push -f`

I didn't realize it was you that change the destination branch. Working on it.

Regards

Copy link
Member

@Al2Klimov Al2Klimov left a comment

Choose a reason for hiding this comment

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

As @julianbrost pointed out, it makes no sense to merge this, yet. As this isn't definitely part of a release, yet. (TBD.) But the changes do exactly what they should. 👍

Just for the record, even this one seems not to fix the comment null deref issue you reported?

@ymartin-ovh
Copy link
Author

Hello

About "Just for the record, even this one seems not to fix the comment null deref issue you reported?", yes this PR does not fix my null dereference.

Regards

@yhabteab yhabteab removed their request for review February 15, 2024 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/api REST API area/configuration DSL, parser, compiler, error handling bug Something isn't working cla/signed core/quality Improve code, libraries, algorithms, inline docs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants