Merge branch 'master' of github.com:containernetworking/cni
authorVZ Cambria <vzcambria@gmail.com>
Tue, 27 Dec 2016 19:38:13 +0000 (14:38 -0500)
committerVZ Cambria <vzcambria@gmail.com>
Tue, 27 Dec 2016 19:38:13 +0000 (14:38 -0500)
commitea324b61d8e203b5b51d3f11c805e5a0c7b300c2
tree40a551c6952b36c87a355ec33ac6edc38ce4741a
parent87b54ff7f3ff93da02368191e5e8d5ff7e406d1e
parent98ff61aac32dcf2eb3044a0d5e5f1814837b3c75
Merge branch 'master' of github.com:containernetworking/cni

Pull upstram 2016 Dec 27