Mistakenly pushed to the wrong branch in the middle of the fix.


Пятница, 31 мая 2019, 14:20 +03:00 от Vladimir Davydov <vdavydov.dev@gmail.com>:


On Fri, May 31, 2019 at 02:07:06PM +0300, Alexander V. Tikhonov wrote:
> Fixed swim headers in addition to commits:
> 88892f13a3934c72721e6240bfa5fe174d62d99b
>
> Closes #4050
> ---
>
> Travis-ci: https://travis-ci.org/tarantool/tarantool/builds/539652447
> Issue: https://github.com/tarantool/tarantool/issues/4050
>
> src/lib/swim/swim_proto.h | 3 ++-
> src/lib/swim/swim_transport.h | 4 ++++
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/src/lib/swim/swim_proto.h b/src/lib/swim/swim_proto.h
> index 482d79fb1..5275d4e7e 100644
> --- a/src/lib/swim/swim_proto.h
> +++ b/src/lib/swim/swim_proto.h
> @@ -33,8 +33,9 @@
> #include "tt_static.h"
> #include "uuid/tt_uuid.h"
> #include <arpa/inet.h>
> -#include <netinet/in.h>
> #include <sys/socket.h>
> +#include <netinet/in.h>
> +#include <netinet/ip.h>
> #include <stdbool.h>
> #include "swim_constants.h"
>
> diff --git a/src/lib/swim/swim_transport.h b/src/lib/swim/swim_transport.h
> index c4e48cdeb..137c73212 100644
> --- a/src/lib/swim/swim_transport.h
> +++ b/src/lib/swim/swim_transport.h
> @@ -32,6 +32,10 @@
> */
> #include <netinet/in.h>
> #include <arpa/inet.h>
> +#include <unistd.h>
> +#include <sys/socket.h>
> +#include <netinet/in.h>
> +#include <netinet/ip.h>
>
> struct ifaddrs;
>

You've just pushed and immediately reverted it. What's going on?


--
Alexander Tikhonov