Merge branch '1.6' of https://github.com/tarantool/tarantool

src/box/lua/snapshot_daemon.lua

@@ -58,9 +58,13 @@ do
 
         local snap_name = sprintf('%020d.snap', tonumber(lsn))
         if fio.basename(last_snap) == snap_name then
-            log.debug('snapshot file %s already exists', last_snap)
+            if daemon.last_snap_name ~= snap_name then
+                daemon.last_snap_name = snap_name
+                log.debug('snapshot file %s already exists', last_snap)
+            end
             return false
         end
+        daemon.last_snap_name = snap_name
 
         local snstat = fio.stat(last_snap)
         if snstat == nil then

src/module_header.h

@@ -42,6 +42,7 @@
 #include <string.h> /* strerror(3) */
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdio.h> /* ssize_t for Apple */
 #include <sys/types.h> /* ssize_t */
 
 /** Extern modifier for all public functions */

test-run @ 48553b23

-Subproject commit afd6fd91ce3f0ee851365096c87791edc05fb6ce
+Subproject commit 48553b239420166e7f7c26dc01f0ec08c36778d6

test/box-tap/net.box.test.lua

@@ -20,7 +20,7 @@ test:is(
 )
 
 -- check that net.box is correct without box.cfg{}
-local uri = inspector:eval('second', 'box.cfg.listen').result[1]
+local uri = inspector:eval('second', 'box.cfg.listen')[1]
 local conn = net_box:new(uri)
 test:is(conn:is_connected(), true, 'connected to instance')
 test:is(conn.space ~= nil, true, 'space exists')