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

requirements: Update requests #472

Merged
merged 1 commit into from Nov 8, 2018

Conversation

NicolasT
Copy link
Contributor

@NicolasT NicolasT commented Nov 6, 2018

Version 2.19.1 and below of the requests library contain a security
issue, fixed in 2.20.0 (cfr. CVE-2018-18074).

See: https://nvd.nist.gov/vuln/detail/CVE-2018-18074

@NicolasT NicolasT added the kind:enhancement New feature or request label Nov 6, 2018
@NicolasT NicolasT added this to the MetalK8s 1.0.1 milestone Nov 6, 2018
@NicolasT NicolasT requested a review from a team November 6, 2018 18:07
@bert-e
Copy link
Contributor

bert-e commented Nov 6, 2018

Hello NicolasT,

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

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Nov 6, 2018

Conflict

A conflict has been raised during the creation of
integration branch w/1.1/improvement/update-requirements with contents from improvement/update-requirements
and development/1.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/1.1/improvement/update-requirements origin/development/1.1
 $ git merge origin/improvement/update-requirements
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/1.1/improvement/update-requirements

Version 2.19.1 and below of the `requests` library contain a security
issue, fixed in 2.20.0 (cfr. CVE-2018-18074).

See: https://nvd.nist.gov/vuln/detail/CVE-2018-18074
@NicolasT NicolasT force-pushed the improvement/update-requirements branch from bedad7a to 797dd07 Compare November 6, 2018 18:08
@NicolasT
Copy link
Contributor Author

NicolasT commented Nov 6, 2018

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Nov 6, 2018

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Nov 6, 2018

Conflict

A conflict has been raised during the creation of
integration branch w/1.1/improvement/update-requirements with contents from improvement/update-requirements
and development/1.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/1.1/improvement/update-requirements origin/development/1.1
 $ git merge origin/improvement/update-requirements
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/1.1/improvement/update-requirements

@bert-e
Copy link
Contributor

bert-e commented Nov 6, 2018

Unknown command

I didn't understand this comment by @NicolasT:

@bert-e bump

I don't know what bump means.

Please edit or delete the corresponding comment so I can move on.

@bert-e
Copy link
Contributor

bert-e commented Nov 6, 2018

Integration data created

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

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

@bert-e
Copy link
Contributor

bert-e commented Nov 6, 2018

Waiting for approval

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

  • one peer

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

@NicolasT NicolasT added the topic:security Security-related issues label Nov 7, 2018
@bert-e
Copy link
Contributor

bert-e commented Nov 7, 2018

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

  • ✔️ development/1.1

  • ✔️ development/1.2

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.

@bert-e
Copy link
Contributor

bert-e commented Nov 8, 2018

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

  • ✔️ development/1.0

  • ✔️ development/1.1

  • ✔️ development/1.2

Please check the status of the associated issue None.

Goodbye NicolasT.

@bert-e bert-e merged commit 797dd07 into development/1.0 Nov 8, 2018
@NicolasT NicolasT deleted the improvement/update-requirements branch December 20, 2018 03:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind:enhancement New feature or request topic:security Security-related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants