Merge pull request kubernetes#5342 from nikhiljindal/masterUrl

Adding http:// prefix to the swagger WebServicesURL to prevent basePath validation errors
duda · Mar 12, 2015 · 27c7756 · 27c7756
2 parents 19b6c85 + 8c3f728
commit 27c7756
Show file tree

Hide file tree

Showing 7 changed files with 3,799 additions and 3,969 deletions.
diff --git a/api/swagger-spec/api.json b/api/swagger-spec/api.json
@@ -1,7 +1,7 @@
 {
   "swaggerVersion": "1.2",
   "apiVersion": "",
-  "basePath": "127.0.0.1:6443",
+  "basePath": "https://127.0.0.1:6443",
   "resourcePath": "/api",
   "apis": [
    {

diff --git a/api/swagger-spec/resourceListing.json b/api/swagger-spec/resourceListing.json
@@ -1,14 +1,6 @@
 {
   "swaggerVersion": "1.2",
   "apis": [
-   {
-    "path": "/api",
-    "description": "get available API versions"
-   },
-   {
-    "path": "/version",
-    "description": "git code version from which this is built"
-   },
    {
     "path": "/api/v1beta1",
     "description": "API at /api/v1beta1 version v1beta1"
@@ -20,6 +12,14 @@
    {
     "path": "/api/v1beta3",
     "description": "API at /api/v1beta3 version v1beta3"
+   },
+   {
+    "path": "/api",
+    "description": "get available API versions"
+   },
+   {
+    "path": "/version",
+    "description": "git code version from which this is built"
    }
   ],
   "apiVersion": "",