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.

Sign up for GitHub

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

Jump to bottom

bugfix: S3C-2017 remove CI badges #740

Merged
merged 1 commit into from
Mar 7, 2019
Merged

bugfix: S3C-2017 remove CI badges #740

merged 1 commit into from
Mar 7, 2019

Conversation

rahulreddy
Copy link
Collaborator

This commit removes the CI badges that are no longer active. It also helps mitigate
a cornercase bug in BertE

@bert-e
Copy link
Contributor

bert-e commented Mar 7, 2019

Hello rahulreddy,

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.

@bert-e
Copy link
Contributor

bert-e commented Mar 7, 2019

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/bugfix/S3C-2017-berte-fix with contents from w/8.0/bugfix/S3C-2017-berte-fix
and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/S3C-2017-berte-fix origin/development/8.1
 $ git merge origin/w/8.0/bugfix/S3C-2017-berte-fix
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/S3C-2017-berte-fix

This was referenced Mar 7, 2019
Closed
Closed
Closed
@bert-e
Copy link
Contributor

bert-e commented Mar 7, 2019

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • stabilization/7.4.3

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented Mar 7, 2019

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@rahulreddy
bugfix: S3C-2017 remove CI badges
53d0ad3 
This commit removes the CI badges that are no longer active. It also helps mitigate
a cornercase bug in BertE
@bert-e
Copy link
Contributor

bert-e commented Mar 7, 2019

History mismatch

Merge commit #6f7fe8dd8987b33e193b4bf5179ebf9f9476cbc8 on the integration branch
w/7.5/bugfix/S3C-2017-berte-fix is merging a branch which is neither the current
branch bugfix/S3C-2017-berte-fix nor the development branch
development/7.5.

It is likely due to a rebase of the branch bugfix/S3C-2017-berte-fix and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@rahulreddy rahulreddy changed the title bugfix: S3C-2002 remove CI badges bugfix: S3C-2017 remove CI badges Mar 7, 2019
@rahulreddy
Copy link
Collaborator Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Mar 7, 2019

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Mar 7, 2019

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/bugfix/S3C-2017-berte-fix with contents from w/8.0/bugfix/S3C-2017-berte-fix
and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/S3C-2017-berte-fix origin/development/8.1
 $ git merge origin/w/8.0/bugfix/S3C-2017-berte-fix
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/S3C-2017-berte-fix

This was referenced Mar 7, 2019
Merged
Merged
@bert-e
Copy link
Contributor

bert-e commented Mar 7, 2019

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • stabilization/7.4.3

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e bert-e mentioned this pull request Mar 7, 2019
Merged
@bert-e
Copy link
Contributor

bert-e commented Mar 7, 2019

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@rahulreddy
Copy link
Collaborator Author

@bert-e approve

@scality scality deleted a comment from bert-e Mar 7, 2019
@bert-e
Copy link
Contributor

bert-e commented Mar 7, 2019

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/7.4

  • ✔️ development/7.5

  • ✔️ development/8.0

  • ✔️ development/8.1

The following branches will NOT be impacted:

  • development/6.4
  • stabilization/7.4.3

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 Mar 7, 2019

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

  • ✔️ development/7.4

  • ✔️ development/7.5

  • ✔️ development/8.0

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • stabilization/7.4.3

Please check the status of the associated issue S3C-2017.

Goodbye rahulreddy.

@bert-e bert-e merged commit 53d0ad3 into development/7.4 Mar 7, 2019
@rahulreddy rahulreddy deleted the bugfix/S3C-2017-berte-fix branch March 7, 2019 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bennettbuchanan bennettbuchanan bennettbuchanan approved these changes

@philipyoo philipyoo philipyoo approved these changes

@JianqinWang JianqinWang JianqinWang approved these changes

@anurag4DSB anurag4DSB anurag4DSB approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rahulreddy @bert-e @anurag4DSB @JianqinWang @philipyoo @bennettbuchanan