Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev

2019-03-04 16:27:52 -08:00 · 2019-03-04 16:27:52 -08:00 · 801401a6e7
commit 801401a6e7
parent de1fc43cc5 270debb3fc
4 changed files with 9 additions and 2 deletions
--- a/controller/PostgreSQL.cpp
+++ b/controller/PostgreSQL.cpp
@ -33,6 +33,7 @@
 #include <libpq-fe.h>
 #include <sstream>
 #include <amqp.h>
+#include <amqp_tcp_socket.h>

 using json = nlohmann::json;
 namespace {