Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	lib/.gitignore
	lib/command.c
	lib/command.h

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/bfd.c b/lib/bfd.c
index 2116fa5c1f..67a84c95f9 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -504,8 +504,8 @@ bfd_client_sendmsg (struct zclient *zclient, int command)
   if (ret < 0)
     {
       if (bfd_debug)
-	zlog_debug ("bfd_client_sendmsg %d: zclient_send_message() failed",
-		   getpid());
+	zlog_debug ("bfd_client_sendmsg %ld: zclient_send_message() failed",
+		   (long) getpid());
       return;
     }