Merge pull request #330 from dwalton76/ospf-no-log-adjacency-changes-detail

author David Lamparter <equinox@diac24.net>

Tue, 4 Apr 2017 19:45:14 +0000 (21:45 +0200)

committer GitHub <noreply@github.com>

Tue, 4 Apr 2017 19:45:14 +0000 (21:45 +0200)
author David Lamparter <equinox@diac24.net>
Tue, 4 Apr 2017 19:45:14 +0000 (21:45 +0200)
committer GitHub <noreply@github.com>
Tue, 4 Apr 2017 19:45:14 +0000 (21:45 +0200)
diff --cc ospf6d/ospf6_top.c
Simple merge
diff --cc ospfd/ospf_vty.c
Simple merge
author	David Lamparter <equinox@diac24.net>
	Tue, 4 Apr 2017 19:45:14 +0000 (21:45 +0200)
committer	GitHub <noreply@github.com>
	Tue, 4 Apr 2017 19:45:14 +0000 (21:45 +0200)
		1	2
ospf6d/ospf6_top.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history