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

ARTESCA-11245 repair metalk8s monitoring salt module #4238

Conversation

aprucolimartins
Copy link
Contributor

@aprucolimartins aprucolimartins commented Feb 15, 2024

No description provided.

@aprucolimartins aprucolimartins requested a review from a team as a code owner February 15, 2024 15:30
@bert-e
Copy link
Contributor

bert-e commented Feb 15, 2024

Hello aprucolimartins,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@aprucolimartins aprucolimartins force-pushed the improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module branch 14 times, most recently from 2a820fa to 50d47b1 Compare February 16, 2024 07:41
@aprucolimartins aprucolimartins changed the base branch from development/127.0 to development/126.0 February 16, 2024 08:32
@scality scality deleted a comment from bert-e Feb 16, 2024
@scality scality deleted a comment from bert-e Feb 16, 2024
@scality scality deleted a comment from bert-e Feb 16, 2024
@aprucolimartins
Copy link
Contributor Author

/approve

@aprucolimartins aprucolimartins force-pushed the improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module branch 7 times, most recently from b0a0c75 to bfb0b62 Compare February 19, 2024 15:30
@aprucolimartins aprucolimartins force-pushed the improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module branch from 4c2b32b to a4a9325 Compare February 26, 2024 14:14
@aprucolimartins aprucolimartins force-pushed the improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module branch from a4a9325 to 53b4fa4 Compare February 26, 2024 14:27
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@aprucolimartins aprucolimartins force-pushed the improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module branch 2 times, most recently from ec180c0 to e4893ce Compare February 26, 2024 14:33
CHANGELOG.md Outdated Show resolved Hide resolved
@aprucolimartins aprucolimartins force-pushed the improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module branch from e4893ce to e27f076 Compare February 26, 2024 14:37
CHANGELOG.md Outdated Show resolved Hide resolved
@aprucolimartins aprucolimartins force-pushed the improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module branch from e27f076 to bb5e30b Compare February 26, 2024 14:41
@aprucolimartins aprucolimartins force-pushed the improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module branch from bb5e30b to 97feea2 Compare February 26, 2024 14:44
@aprucolimartins
Copy link
Contributor Author

/reset

@scality scality deleted a comment from bert-e Feb 26, 2024
@scality scality deleted a comment from bert-e Feb 26, 2024
@scality scality deleted a comment from bert-e Feb 26, 2024
@scality scality deleted a comment from bert-e Feb 26, 2024
@scality scality deleted a comment from bert-e Feb 26, 2024
@scality scality deleted a comment from bert-e Feb 26, 2024
@bert-e
Copy link
Contributor

bert-e commented Feb 26, 2024

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 26, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/127.0/improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module with contents from improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module
and development/127.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/127.0/improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module origin/development/127.0
 $ git merge origin/improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/127.0/improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 26, 2024

Build failed

The build for commit did not succeed in branch w/127.0/improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2024

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/126.0

  • ✔️ development/127.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2024

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/126.0

  • ✔️ development/127.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue ARTESCA-11245.

Goodbye aprucolimartins.

@bert-e bert-e merged commit 97feea2 into development/126.0 Feb 27, 2024
68 checks passed
@bert-e bert-e deleted the improvement/ARTESCA-11245_repair_metalk8s_monitoring_salt_module branch February 27, 2024 12:28
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.

3 participants