Merge branch 'cmaster-next' into vtysh-grammar

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

Conflicts:
	isisd/isis_routemap.c
	zebra/rt_netlink.c

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/command.c b/lib/command.c
index 63cfc695dc..914641724f 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -2218,6 +2218,12 @@ host_config_set (const char *filename)
   host.config = XSTRDUP (MTYPE_HOST, filename);
 }
 
+const char *
+host_config_get (void)
+{
+  return host.config;
+}
+
 void
 install_default (enum node_type node)
 {