Merge branch '2.3' into develop

2019-01-07 10:52:07 +02:00
parent cf9ac9004e 0859f3caff
commit f0f9c21d1c
67 changed files with 777 additions and 469 deletions
--- a/include/maxscale/session_stats.hh
+++ b/include/maxscale/session_stats.hh
@ -15,7 +15,7 @@
 #include <maxscale/ccdefs.hh>


-#include <map>
+#include <unordered_map>

 #include <maxscale/server.hh>
 #include <maxbase/average.hh>
@ -59,5 +59,5 @@ private:
    maxbase::CumulativeAverage m_num_ave_session_selects;
 };

-using SrvStatMap = std::map<SERVER*, ServerStats>;
+using SrvStatMap = std::unordered_map<SERVER*, ServerStats>;
 }