Merge commit '09cb4a885f88d30b5108d215dcdaa5163229a230' into develop

2019-04-04 14:34:17 +03:00
parent f812302d62 09cb4a885f
commit 2aa3515fc8
92 changed files with 1560 additions and 1696 deletions
--- a/maxscale-system-test/keepalived_func.h
+++ b/maxscale-system-test/keepalived_func.h
@ -1,5 +1,4 @@
-#ifndef KEEPALIVED_FUNC_H
-#define KEEPALIVED_FUNC_H
+#pragma once

 #include "testconnections.h"

@ -9,5 +8,3 @@ char virtual_ip[27];
 char* print_version_string(TestConnections* Test);
 void  configure_keepalived(TestConnections* Test, char* keepalived_file);
 void  stop_keepalived(TestConnections* Test);
-
-#endif      // KEEPALIVED_FUNC_H