Merge pull request #60626 from nikhita/quota-01-remove-todo

Automatic merge from submit-queue (batch tested with PRs 64882, 64692, 64389, 60626, 64840). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. [minor] apimachinery: remove note for quota serialization Fixes #53503 We are way ahead of 1.5 now. **Release note**: ```release-note NONE ``` /cc sttts

Merge pull request #60626 from nikhita/quota-01-remove-todo
02c7325e · Kubernetes Submit Queue · GitHub · 8a1e8305 · 1c4110fd · 02c7325e
Unverified Commit 02c7325e authored Jun 20, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 11 deletions

generated.proto .../src/k8s.io/apimachinery/pkg/api/resource/generated.proto +0 -5

quantity.go staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go +1 -6

No files found.
--- a/staging/src/k8s.io/apimachinery/pkg/api/resource/generated.proto
+++ b/staging/src/k8s.io/apimachinery/pkg/api/resource/generated.proto
@@ -67,11 +67,6 @@ option go_package = "resource";
 //   1.5 will be serialized as "1500m"
 //   1.5Gi will be serialized as "1536Mi"
 // 
-// NOTE: We reserve the right to amend this canonical format, perhaps to
-//   allow 1.5 to be canonical.
-// TODO: Remove above disclaimer after all bikeshedding about format is over,
-//   or after March 2015.
-// 
 // Note that the quantity will NEVER be internally represented by a
 // floating point number. That is the whole point of this exercise.
 // 

--- a/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go
+++ b/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go
@@ -69,11 +69,6 @@ import (
 //   1.5 will be serialized as "1500m"
 //   1.5Gi will be serialized as "1536Mi"
 //
-// NOTE: We reserve the right to amend this canonical format, perhaps to
-//   allow 1.5 to be canonical.
-// TODO: Remove above disclaimer after all bikeshedding about format is over,
-//   or after March 2015.
-//
 // Note that the quantity will NEVER be internally represented by a
 // floating point number. That is the whole point of this exercise.
 //
@@ -506,7 +501,7 @@ func (q *Quantity) Sign() int {
 	return q.i.Sign()
 }

-// AsScaled returns the current value, rounded up to the provided scale, and returns
+// AsScale returns the current value, rounded up to the provided scale, and returns
 // false if the scale resulted in a loss of precision.
 func (q *Quantity) AsScale(scale Scale) (CanonicalValue, bool) {
 	if q.d.Dec != nil {