Merge branch '2.1' into 2.2

2018-02-05 10:17:31 +02:00 · 2018-02-05 10:17:31 +02:00 · aac8c41800
commit aac8c41800
parent e1f1d8e58a e670596486
1 changed files with 1 additions and 1 deletions
--- a/maxscale-system-test/local_address.cpp
+++ b/maxscale-system-test/local_address.cpp
@ -15,7 +15,7 @@
 #include <algorithm>
 #include <iostream>
 #include <iterator>
-#include <list>
+#include <vector>
 #include <string>
 #include <netinet/in.h>
 #include <sys/types.h>