]> git.puffer.fish Git - matthieu/frr.git/commit
projects / matthieu / frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7c9a4d2 6ac011a)
Merge branch 'frr/pull/964' into stable/3.0
authorDavid Lamparter <equinox@opensourcerouting.org>
Wed, 16 Aug 2017 13:20:14 +0000 (15:20 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Wed, 16 Aug 2017 13:20:14 +0000 (15:20 +0200)
commitf76d3aebf9645c7dbe6f85916b4f7a86a0d73c74
tree12862743f620ce3914c0757290c8c0d87fed88dctree | snapshot
parent7c9a4d221f90371bfc50e566c84dcf8ac5a133cacommit | diff
parent6ac011aaadbf6ef1a3b64b6a2518da11ea62a2abcommit | diff
Merge branch 'frr/pull/964' into stable/3.0

This accidentally ended up merged to master... *derp*

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Unnamed repository; edit this file 'description' to name the repository.