Merge pull request kubernetes#73888 from smarterclayton/duration

k8s-ci-robot · web-flow · commit 3dfb9e8f49ed · 2019-02-10T13:50:30.000-08:00
Make CRD column printers consistent with typed printers
diff --git a/staging/src/k8s.io/apimachinery/pkg/api/meta/table/table.go b/staging/src/k8s.io/apimachinery/pkg/api/meta/table/table.go
@@ -67,5 +67,5 @@ func ConvertToHumanReadableDateType(timestamp metav1.Time) string {
 	if timestamp.IsZero() {
 		return "<unknown>"
 	}
-	return duration.ShortHumanDuration(time.Now().Sub(timestamp.Time))
+	return duration.HumanDuration(time.Now().Sub(timestamp.Time))
 }

Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,5 @@ func ConvertToHumanReadableDateType(timestamp metav1.Time) string {`
`67`	`67`	`if timestamp.IsZero() {`
`68`	`68`	`return "<unknown>"`
`69`	`69`	`}`
`70`		`- return duration.ShortHumanDuration(time.Now().Sub(timestamp.Time))`
	`70`	`+ return duration.HumanDuration(time.Now().Sub(timestamp.Time))`
`71`	`71`	`}`