github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19105 from smarterclayton/prepare_negotiate

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-27 13:35:30 -08:00
parent a95f1b84cb 38c7eded99
commit 458eb5284a
41 changed files with 306 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/testapi/testapi.go
View File

@@ -79,6 +79,10 @@ func init() {
Extensions = Groups[extensions.GroupName]
}
func (g TestGroup) ContentConfig() (string, *unversioned.GroupVersion, runtime.Codec) {
return "application/json", g.GroupVersion(), g.Codec()
}
func (g TestGroup) GroupVersion() *unversioned.GroupVersion {
copyOfGroupVersion := g.externalGroupVersion
return &copyOfGroupVersion