]> git.proxmox.com Git - mirror_frr.git/commit
projects / mirror_frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ea4ecfb 78986c0)
Merge commit '78986c0' into tmp-3.0-master-merge
authorDavid Lamparter <equinox@opensourcerouting.org>
Wed, 9 Aug 2017 10:09:04 +0000 (12:09 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Wed, 9 Aug 2017 10:09:04 +0000 (12:09 +0200)
commit211ee93ffb02c5b404a7206e4f46bd23d02d2d26
tree455f4aac55106cfbda95f9685d62aacc32ad1101tree
parentea4ecfb3511e9ca90b8682d73e96477df00bcfb7commit | diff
parent78986c05cdb4adf6019d02dc328341943c573b35commit | diff
Merge commit '78986c0' into tmp-3.0-master-merge

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>
FRRouting mirror