Merge pull request #6475 from bgrant0607/api

Change "time/Time" to "util.Time", which is what we use in our API for time

Merge pull request #6475 from bgrant0607/api
ed2192a6 · Nikhil Jindal · 338a51d9 · 9d9948e3 · ed2192a6 · ed2192a6
Commit ed2192a6 authored Apr 06, 2015 by Nikhil Jindal
Showing with 1 addition and 1 deletion

v1beta1.json api/swagger-spec/v1beta1.json +0 -0

v1beta2.json api/swagger-spec/v1beta2.json +0 -0

v1beta3.json api/swagger-spec/v1beta3.json +0 -0

api_installer.go pkg/apiserver/api_installer.go +1 -1

No files found.
--- a/api/swagger-spec/v1beta1.json
+++ b/api/swagger-spec/v1beta1.json
--- a/api/swagger-spec/v1beta2.json
+++ b/api/swagger-spec/v1beta2.json
--- a/api/swagger-spec/v1beta3.json
+++ b/api/swagger-spec/v1beta3.json
--- a/pkg/apiserver/api_installer.go
+++ b/pkg/apiserver/api_installer.go
@@ -727,7 +727,7 @@ func typeToJSON(typeName string) string {
 		return "string"
 	case "float64", "float32":
 		return "number"
-	case "time/Time":
+	case "util.Time":
 		return "string"
 	default:
 		return typeName