From: Tom Denham <tom@tomdee.co.uk>
Date: Tue, 14 Feb 2017 19:47:59 +0000 (-0800)
Subject: Merge pull request #369 from containernetworking/port-mapping
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=6f3b0abcc7d4ba4bee93fd7a5c64d6a06ea162c2;p=cni.git

Merge pull request #369 from containernetworking/port-mapping

CONVENTIONS.md: Update details on port-mappings
---

6f3b0abcc7d4ba4bee93fd7a5c64d6a06ea162c2