From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <v.shpilevoy@tarantool.org>
Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
 bits)) (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 19742469719
 for <tarantool-patches@dev.tarantool.org>;
 Sat, 14 Nov 2020 01:42:53 +0300 (MSK)
References: <20201106083724.508438-1-gorcunov@gmail.com>
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Message-ID: <a823295d-f7f2-20b3-2e5c-74a97791d1ab@tarantool.org>
Date: Fri, 13 Nov 2020 23:42:52 +0100
MIME-Version: 1.0
In-Reply-To: <20201106083724.508438-1-gorcunov@gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Subject: Re: [Tarantool-patches] [PATCH] raft: use vclock_map_t for voting
	tracking
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: tml <tarantool-patches@dev.tarantool.org>

Hi! Thanks for the patch!

Applied the diff below and pushed to master and 2.6.

====================
--- a/src/box/raft.h
+++ b/src/box/raft.h
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include "tarantool_ev.h"
 #include "trigger.h"
-#include "vclock.h"
+#include "vclock/vclock.h"
 
 #if defined(__cplusplus)
 extern "C" {
@@ -70,7 +70,6 @@ extern "C" {
 
 struct fiber;
 struct raft_request;
-struct vclock;
 
 enum raft_state {
 	/**