kubernetes/pkg/api/v1
k8s-merge-robot 04416c6b2d Merge pull request #24136 from derekwaynecarr/fix_constants
Automatic merge from submit-queue

Resource name constants were incorrect in versioned types.go

The constant field names and actual values to quota requests and limits for cpu and memory were incorrect in the v1 types.go file.

Important to note for reviewer:
* the constant fields here are unused in the project at this time
* the values those unused constant fields mapped to are not actually supported by the project
* there is no backwards compatibility concern, but if/when we look to convert to using versioned clients, we should have the correct constant fields and values.

The correct values were here:
https://github.com/kubernetes/kubernetes/blob/master/pkg/api/types.go#L2213

<!-- Reviewable:start -->
---
This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/24136)
<!-- Reviewable:end -->
2016-05-12 15:49:20 -07:00
..
backward_compatibility_test.go update CodecFor for GroupVersion 2015-12-15 10:56:00 -05:00
conversion_generated.go Merge pull request #22575 from MikaelCluseau/wip-issue-20466 2016-05-08 08:45:15 -07:00
conversion_test.go Refactor diff into sub pkg 2016-03-21 20:21:39 +08:00
conversion.go Change "speter.net/go/exp/math/dec/inf" dependency 2016-05-11 17:01:28 -07:00
deep_copy_generated.go Merge pull request #22575 from MikaelCluseau/wip-issue-20466 2016-05-08 08:45:15 -07:00
defaults_test.go Switch API objects to not register per version codecs 2016-01-22 01:10:21 -05:00
defaults.go Cleanup the code with new engine-api 2016-04-29 13:34:38 -07:00
doc.go Switch to new generator 2016-04-11 08:04:45 +02:00
generated.pb.go Merge pull request #22575 from MikaelCluseau/wip-issue-20466 2016-05-08 08:45:15 -07:00
generated.proto Merge pull request #22575 from MikaelCluseau/wip-issue-20466 2016-05-08 08:45:15 -07:00
register.go Implement a streaming serializer for watch 2016-04-11 11:22:05 -04:00
types_swagger_doc_generated.go Merge pull request #22575 from MikaelCluseau/wip-issue-20466 2016-05-08 08:45:15 -07:00
types.generated.go Run codegen and codecgen 2016-05-11 17:15:55 -07:00
types.go Merge pull request #24136 from derekwaynecarr/fix_constants 2016-05-12 15:49:20 -07:00