mirror of https://github.com/fafhrd91/actix-net
fix changelog
This commit is contained in:
parent
358f81f34e
commit
6daacfa379
|
@ -22,7 +22,6 @@
|
|||
[#207]: https://github.com/actix/actix-net/pull/207
|
||||
[#236]: https://github.com/actix/actix-net/pull/236
|
||||
|
||||
|
||||
## [1.1.1] - 2020-04-30
|
||||
|
||||
### Fixed
|
||||
|
|
|
@ -1,19 +1,9 @@
|
|||
# Changes
|
||||
|
||||
## Unreleased - 2020-xx-xx
|
||||
<<<<<<< HEAD
|
||||
* Update `mio` dependency to 0.7.3.
|
||||
* Remove `socket2` dependency.
|
||||
* `ServerBuilder::backlog` would accept `u32` instead of `i32`.
|
||||
* Use `concurrent-queue` to manage poll wakes instead of `futures::channel::mpsc::unbounded`.
|
||||
* Remove `AcceptNotify` type and pass `WakerQueue` to `Worker` for wake up the `Accept`'s `Poll`.
|
||||
* Convert `mio::net::TcpStream` to `actix_rt::net::TcpStream`(`UnixStream` for uds) using `FromRawFd` and `IntoRawFd`(`FromRawSocket` and `IntoRawSocket` on windows).
|
||||
* Remove `AsyncRead` and `AsyncWrite` trait bound for `socket::FromStream` trait.
|
||||
=======
|
||||
* Merge `actix-testing` to `actix-server` as `test_server` mod.
|
||||
|
||||
## 2.0.0-beta.1 - 2020-12-28
|
||||
>>>>>>> upstream/master
|
||||
* Added explicit info log message on accept queue pause. [#215]
|
||||
* Prevent double registration of sockets when back-pressure is resolved. [#223]
|
||||
* Update `mio` dependency to `0.7.3`. [#239]
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Changes
|
||||
|
||||
## Unreleased - 2020-xx-xx
|
||||
* Update `bytes` dependency to 0.6
|
||||
* Update `bytes` dependency to `1`
|
||||
|
||||
## [0.1.5] - 2020-03-30
|
||||
|
||||
|
|
Loading…
Reference in New Issue