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, 2 insertions, 1 deletions

diff --git a/lib/log.c b/lib/log.c
index cd1f0bb771..f9877300b4 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -58,7 +58,8 @@ const char *zlog_proto_names[] =
   "LDP",
   "ISIS",
   "PIM",
-  "RFP", 
+  "RFP",
+  "WATCHQUAGGA",
   NULL,
 };