Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster

This commit is contained in:
Daniel Walton 2015-10-20 22:14:24 +00:00
commit 62357c3cfb

View File

@ -7688,6 +7688,9 @@ DEFUN (ip_ospf_area,
params = IF_DEF_PARAMS (ifp); params = IF_DEF_PARAMS (ifp);
if (OSPF_IF_PARAM_CONFIGURED(params, if_area)) if (OSPF_IF_PARAM_CONFIGURED(params, if_area))
{ {
vty_out (vty,
"Must remove previous area config before changing ospf area %s",
VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
} }