]> git.proxmox.com Git - mirror_frr.git/commit
projects / mirror_frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0e236c6cd7bef12a2a375153a0e2d81a961562a2
tree29fbd9adce8d50fb3183069e57f88f875b73efc0tree
parent69965f533aa368b4a630dafbcd72a4f600bd9e1ccommit | diff
parentc47b10cae1e0a623589692d6bd8793c2a17ed29acommit | diff
Merge branch 'stable/3.0' 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