Skip to content

Commit

Permalink
Merge pull request #1598 from urllib3/haikuginger/remove-akamai
Browse files Browse the repository at this point in the history
Fix names; remove Akamai as ongoing sponsor
  • Loading branch information
haikuginger committed May 4, 2019
2 parents 7c8422f + 78dbac0 commit 7d813bc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ In chronological order:
* Shige Takeda <smtakeda@gmail.com>
* Started Recipes documentation and added a recipe about handling concatenated gzip data in HTTP response

* Jesse Shapiro <jesse@jesseshapiro.net>
* Jess Shapiro <jesse@jesseshapiro.net>
* Various character-encoding fixes/tweaks
* Disabling IPv6 DNS when IPv6 connections not supported

Expand Down Expand Up @@ -244,8 +244,8 @@ In chronological order:
* Fix ``util.selectors._fileobj_to_fd`` to accept ``long``.
* Update appveyor tox setup to use the 64bit python.

* Akamai (through Jesse Shapiro) <jshapiro@akamai.com>
* Ongoing maintenance
* Akamai (through Jess Shapiro) <jshapiro@akamai.com>
* Ongoing maintenance; 2017-2018

* Dominique Leuenberger <dimstar@opensuse.org>
* Minor fixes in the test suite
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Maintainers

- `@theacodes <https://github.com/theacodes>`_ (Thea Flowers)
- `@sethmlarson <https://github.com/sethmlarson>`_ (Seth M. Larson)
- `@haikuginger <https://github.com/haikuginger>`_ (Jesse Shapiro)
- `@haikuginger <https://github.com/haikuginger>`_ (Jess Shapiro)
- `@lukasa <https://github.com/lukasa>`_ (Cory Benfield)
- `@sigmavirus24 <https://github.com/sigmavirus24>`_ (Ian Cordasco)
- `@shazow <https://github.com/shazow>`_ (Andrey Petrov)
Expand Down Expand Up @@ -127,5 +127,5 @@ Sponsors include:

- Google Cloud Platform (2018-present), sponsors `@theacodes <https://github.com/theacodes>`_'s work on an ongoing basis
- Abbott (2018-present), sponsors `@sethmlarson <https://github.com/sethmlarson>`_'s work on an ongoing basis
- Akamai (2017-present), sponsors `@haikuginger <https://github.com/haikuginger>`_'s work on an ongoing basis
- Akamai (2017-2018), sponsored `@haikuginger <https://github.com/haikuginger>`_'s work on urllib3
- Hewlett Packard Enterprise (2016-2017), sponsored `@Lukasa’s <https://github.com/Lukasa>`_ work on urllib3

0 comments on commit 7d813bc

Please sign in to comment.