Merge remote-tracking branch 'refs/remotes/kubernetes/master' into UC-design-patch

2016-12-13 21:33:46 +00:00
parent 08a199d6d1 0c4de02185
commit 8264a17c4e
102 changed files with 5467 additions and 978 deletions
@@ -6,10 +6,6 @@ $( document ).ready(function() {
    var forwardingURL=window.location.href;

    var redirects = [{
-        "from": "third_party/swagger-ui",
-        "to": "http://kubernetes.io/kubernetes/third_party/swagger-ui/"
-    },
-    {
        "from": "resource-quota",
        "to": "http://kubernetes.io/docs/admin/resourcequota/"
    },