]> git.proxmox.com Git - mirror_frr.git/commitdiff
projects / mirror_frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69965f5 c47b10c)
Merge branch 'stable/3.0' into tmp-3.0-master-merge
authorDavid Lamparter <equinox@diac24.net>
Wed, 9 Aug 2017 11:13:01 +0000 (13:13 +0200)
committerDavid Lamparter <equinox@diac24.net>
Wed, 9 Aug 2017 11:13:01 +0000 (13:13 +0200)
Marker (--strategy=ours) merge to record which point in history master
is in sync with related to stable/3.0.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

Trivial merge
FRRouting mirror