Merge master into 'dist'.

2016-01-18 23:41:44 -06:00
parent cd232bed13 316017c516
commit 2a4bc92d08
2 changed files with 3 additions and 3 deletions
@@ -106,7 +106,7 @@
            <td>Ports:</td>
            <td>
                <ul style="display:inline-table">
-                    <li ng-repeat="(containerport, hostports) in container.HostConfig.PortBindings">
+                    <li ng-repeat="(containerport, hostports) in container.NetworkSettings.Ports">
                        {{ containerport }} => <span class="label label-default" ng-repeat="(k,v) in hostports">{{ v.HostIp }}:{{ v.HostPort }}</span>
                    </li>
                </ul>