Merge branch 'cmaster-next' into vtysh-grammar

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

Conflicts:
	lib/command.c
	lib/vty.c

1 files changed, 1 insertions, 0 deletions

diff --git a/lib/log.h b/lib/log.h
index cd4cd1495a..b36e5fbc80 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -59,6 +59,7 @@ typedef enum
   ZLOG_ISIS,
   ZLOG_PIM,
   ZLOG_RFP,
+  ZLOG_WATCHQUAGGA,
 } zlog_proto_t;
 
 /* If maxlvl is set to ZLOG_DISABLED, then no messages will be sent