]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #1428 from LabNConsulting/working/master/indent
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 7 Mar 2018 15:44:37 +0000 (10:44 -0500)
committerGitHub <noreply@github.com>
Wed, 7 Mar 2018 15:44:37 +0000 (10:44 -0500)
frr: conform with COMMUNITY.md formatting rules

1  2 
bgpd/bgp_vty.c
bgpd/bgpd.c
lib/netns_linux.c
ospfd/ospfd.c

diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
index a92431d1ae2c2e54551148ac96d00ae7cc192882,eddd801127038e98f9f262b0554b25ad87cbd08d..01616be7115c0d9d7b859d17df784bd12c2cb578
@@@ -539,6 -529,5 +534,5 @@@ ns_id_t ns_get_default_id(void
  {
        if (default_ns)
                return default_ns->ns_id;
 -      return NS_UNKNOWN;
 +      return NS_DEFAULT_INTERNAL;
  }
diff --cc ospfd/ospfd.c
Simple merge