merge from develop

merge from develop

maxscale.spec

@@ -43,7 +43,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d/
 mkdir -p $RPM_BUILD_ROOT%{install_path}
 cp -r binaries/* $RPM_BUILD_ROOT%{install_path}
 cp maxscale.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d/
-cp -r etc/init.d/maxscale $RPM_BUILD_ROOT/etc/init.d/
+cp etc/init.d/maxscale $RPM_BUILD_ROOT/etc/init.d/
 
 %clean
 
@@ -51,6 +51,6 @@ cp -r etc/init.d/maxscale $RPM_BUILD_ROOT/etc/init.d/
 %defattr(-,root,root)
 %{install_path}
 /etc/ld.so.conf.d/maxscale.conf
-/etc/inid.d/maxscale
+/etc/init.d/maxscale
 
 %changelog

server/modules/routing/readconnroute.c

@@ -111,13 +111,13 @@ static  void    clientReply(
         void    *router_session,
         GWBUF   *queue,
         DCB     *backend_dcb);
-static  void	handleError(
-        ROUTER		*instance,
-        void		*router_session,
-        GWBUF		*errbuf,
-        DCB		*backend_dcb,
-        error_action_t	action,
-        bool		*succp);
+static  void             handleError(
+        ROUTER           *instance,
+        void             *router_session,
+        GWBUF            *errbuf,
+        DCB              *backend_dcb,
+        error_action_t   action,
+        bool             *succp);
 static  uint8_t getCapabilities (ROUTER* inst, void* router_session);
 
 
@@ -726,12 +726,12 @@ clientReply(
  */
 static  void
 handleError(
-        ROUTER		*instance,
-        void		*router_session,
-        GWBUF		*errbuf,
-        DCB		*backend_dcb,
-        error_action_t	action,
-        bool		*succp)
+        ROUTER           *instance,
+        void             *router_session,
+        GWBUF            *errbuf,
+        DCB              *backend_dcb,
+        error_action_t   action,
+        bool             *succp)
 {
 	DCB		*client = NULL;
 	SESSION         *session = backend_dcb->session;