Merge branch 'cmaster-next' into vtysh-grammar

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

Conflicts:
	bgpd/bgp_route.c
	bgpd/bgp_routemap.c
	bgpd/bgp_vty.c
	isisd/isis_redist.c
	isisd/isis_routemap.c
	isisd/isis_vty.c
	isisd/isisd.c
	lib/command.c
	lib/distribute.c
	lib/if.c
	lib/keychain.c
	lib/routemap.c
	lib/routemap.h
	ospf6d/ospf6_asbr.c
	ospf6d/ospf6_interface.c
	ospf6d/ospf6_neighbor.c
	ospf6d/ospf6_top.c
	ospf6d/ospf6_zebra.c
	ospf6d/ospf6d.c
	ospfd/ospf_routemap.c
	ospfd/ospf_vty.c
	ripd/rip_routemap.c
	ripngd/ripng_routemap.c
	vtysh/extract.pl.in
	vtysh/vtysh.c
	zebra/interface.c
	zebra/irdp_interface.c
	zebra/rt_netlink.c
	zebra/rtadv.c
	zebra/test_main.c
	zebra/zebra_routemap.c
	zebra/zebra_vty.c

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/vrf.h b/lib/vrf.h
index e0fd25b9b2..f1fbad9ff5 100644
--- a/lib/vrf.h
+++ b/lib/vrf.h
@@ -24,6 +24,7 @@
 #define _ZEBRA_VRF_H
 
 #include "linklist.h"
+#include "qobj.h"
 
 /* The default NS ID */
 #define NS_DEFAULT 0
@@ -81,7 +82,10 @@ struct vrf
 
   /* User data */
   void *info;
+
+  QOBJ_FIELDS
 };
+DECLARE_QOBJ_TYPE(vrf)
 
 
 extern struct list *vrf_list;