git://git.halfball.org / plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eff441b fbced0c)
Merge branch 'master' of github.com:containernetworking/plugins into anycast-v1 anycast-v1
authorMichael C Cambria <mcc@node.halfball.org>
Sat, 11 Nov 2017 15:59:36 +0000 (15:59 +0000)
committerMichael C Cambria <mcc@node.halfball.org>
Sat, 11 Nov 2017 15:59:36 +0000 (15:59 +0000)
Keeping up to date with upstream


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.